lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/recipesteps

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
This commit is contained in:
Sipke Schoorstra
2015-07-22 23:26:23 +01:00
parent 1d8897e49e cf94a646c5
commit eade51a9db
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
View File

@@ -8,18 +8,17 @@
@{ @{
var groupedRecipes = Model.Recipes.Where(x => !String.IsNullOrWhiteSpace(x.Category)).GroupBy(x => x.Category); var groupedRecipes = Model.Recipes.Where(x => !String.IsNullOrWhiteSpace(x.Category)).GroupBy(x => x.Category);
var unspecifiedCategoryRecipes = Model.Recipes.Where(x => String.IsNullOrWhiteSpace(x.Category)).ToList(); var unspecifiedCategoryRecipes = Model.Recipes.Where(x => String.IsNullOrWhiteSpace(x.Category)).ToList();
var groupCount = groupedRecipes.Count() + unspecifiedCategoryRecipes.Count();
} }
@helper RenderRecipeOptions(IEnumerable<Recipe> recipes) { @helper RenderRecipeOptions(IEnumerable<Recipe> recipes) {
foreach (var recipe in recipes) { foreach (var recipe in recipes) {
var optionAttributes = new RouteValueDictionary { var optionAttributes = new RouteValueDictionary {{ "data-recipe-description", recipe.Description }};
{ "data-recipe-description", recipe.Description } if (Model.Recipe == null && recipe.Name == "Default") {
}; optionAttributes["selected"] = "selected";
if (Model.Recipe == null && recipe.Name == "Default") { }
optionAttributes["selected"] = "selected"; @Html.SelectOption(Model.Recipe, recipe.Name, recipe.Name, optionAttributes)
} }
@Html.SelectOption(Model.Recipe, recipe.Name, recipe.Name, optionAttributes)
} }
}
<h1>@Html.TitleForPage(T("Get Started").ToString())</h1> <h1>@Html.TitleForPage(T("Get Started").ToString())</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {
@@ -66,24 +65,19 @@ if (!Model.DatabaseIsPreconfigured) {
<div data-controllerid="builtin" data-defaultstate="hidden"> <div data-controllerid="builtin" data-defaultstate="hidden">
<label for="DatabaseConnectionString">@T("Connection string")</label> <label for="DatabaseConnectionString">@T("Connection string")</label>
@Html.EditorFor(svm => svm.DatabaseConnectionString) @Html.EditorFor(svm => svm.DatabaseConnectionString)
<span data-controllerid="sqlserver" class="hint databaseTypeHint"> <span data-controllerid="sqlserver" class="hint databaseTypeHint">
@T("Data Source=sqlServerName;Initial Catalog=dbName;User ID=userName;Password=password") @T("Data Source=sqlServerName;Initial Catalog=dbName;User ID=userName;Password=password")
</span> </span>
<span data-controllerid="mysql" class="hint databaseTypeHint"> <span data-controllerid="mysql" class="hint databaseTypeHint">
@T("Data Source=serverName;Database=dbName;User Id=userName;Password=password") @T("Data Source=serverName;Database=dbName;User Id=userName;Password=password")
</span> </span>
<span data-controllerid="postgresql" class="hint databaseTypeHint"> <span data-controllerid="postgresql" class="hint databaseTypeHint">
@T("Server=serverName;Port=5432;Database=dbName;User Id=userName;Password=password") @T("Server=serverName;Port=5432;Database=dbName;User Id=userName;Password=password")
</span> </span>
<br /><br /> <br /><br />
<label for="DatabaseTablePrefix">@T("Database Table Prefix")</label> <label for="DatabaseTablePrefix">@T("Database Table Prefix")</label>
@Html.EditorFor(svm => svm.DatabaseTablePrefix) @Html.EditorFor(svm => svm.DatabaseTablePrefix)
</div> </div>
</fieldset> </fieldset>
} }
<fieldset> <fieldset>
@@ -91,14 +85,14 @@ if (!Model.DatabaseIsPreconfigured) {
<div>@T("Orchard Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box.")</div> <div>@T("Orchard Recipes allow you to setup your site with additional pre-configured options, features and settings out of the box.")</div>
<div> <div>
<select id="@Html.FieldIdFor(m => m.Recipe)" name="@Html.FieldNameFor(m => m.Recipe)" class="recipe"> <select id="@Html.FieldIdFor(m => m.Recipe)" name="@Html.FieldNameFor(m => m.Recipe)" class="recipe">
@foreach(var recipeGroup in groupedRecipes.OrderBy(x => x.Key)) { @foreach (var recipeGroup in groupedRecipes.OrderBy(x => x.Key)) {
if (groupedRecipes.Count() > 1) { if (groupCount > 1) {
<optgroup label="@recipeGroup.Key"></optgroup> <optgroup label="@recipeGroup.Key"></optgroup>
} }
@RenderRecipeOptions(recipeGroup.OrderBy(x => x.Name)) @RenderRecipeOptions(recipeGroup.OrderBy(x => x.Name))
} }
@if (unspecifiedCategoryRecipes.Any()) { @if (unspecifiedCategoryRecipes.Any()) {
if (groupedRecipes.Any()) { if (groupCount > 1) {
<optgroup label="@T("Unspecified")"></optgroup> <optgroup label="@T("Unspecified")"></optgroup>
} }
@RenderRecipeOptions(unspecifiedCategoryRecipes.OrderBy(x => x.Name)) @RenderRecipeOptions(unspecifiedCategoryRecipes.OrderBy(x => x.Name))
@@ -118,7 +112,6 @@ if (!Model.DatabaseIsPreconfigured) {
</div> </div>
</div> </div>
</div> </div>
<fieldset> <fieldset>
<button class="primaryAction setupButton" type="submit">@T("Finish Setup")</button> <button class="primaryAction setupButton" type="submit">@T("Finish Setup")</button>
</fieldset> </fieldset>