Merge branch 'dev' into feature/recipesteps

Conflicts:
	src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml

src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml

@@ -8,12 +8,11 @@
 @{ 
     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 groupCount = groupedRecipes.Count() + unspecifiedCategoryRecipes.Count();
 }
 @helper RenderRecipeOptions(IEnumerable<Recipe> 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";
             }
@@ -66,24 +65,19 @@ if (!Model.DatabaseIsPreconfigured) {
     <div data-controllerid="builtin" data-defaultstate="hidden">
         <label for="DatabaseConnectionString">@T("Connection string")</label>
         @Html.EditorFor(svm => svm.DatabaseConnectionString)
-            
         <span data-controllerid="sqlserver" class="hint databaseTypeHint">
             @T("Data Source=sqlServerName;Initial Catalog=dbName;User ID=userName;Password=password")
         </span>
-
         <span data-controllerid="mysql" class="hint databaseTypeHint">
             @T("Data Source=serverName;Database=dbName;User Id=userName;Password=password")
         </span>
-
         <span data-controllerid="postgresql" class="hint databaseTypeHint">
             @T("Server=serverName;Port=5432;Database=dbName;User Id=userName;Password=password")
         </span>
-
         <br /><br />
         <label for="DatabaseTablePrefix">@T("Database Table Prefix")</label>
         @Html.EditorFor(svm => svm.DatabaseTablePrefix)
     </div>
-
 </fieldset>
 }
 <fieldset>
@@ -92,13 +86,13 @@ if (!Model.DatabaseIsPreconfigured) {
     <div>
         <select id="@Html.FieldIdFor(m => m.Recipe)" name="@Html.FieldNameFor(m => m.Recipe)" class="recipe">
                 @foreach (var recipeGroup in groupedRecipes.OrderBy(x => x.Key)) {
-            if (groupedRecipes.Count() > 1) {
+                    if (groupCount > 1) {
             <optgroup label="@recipeGroup.Key"></optgroup>
             }
             @RenderRecipeOptions(recipeGroup.OrderBy(x => x.Name))
         }
         @if (unspecifiedCategoryRecipes.Any()) {
-            if (groupedRecipes.Any()) {
+                    if (groupCount > 1) {
             <optgroup label="@T("Unspecified")"></optgroup>
             }
             @RenderRecipeOptions(unspecifiedCategoryRecipes.OrderBy(x => x.Name))
@@ -118,7 +112,6 @@ if (!Model.DatabaseIsPreconfigured) {
         </div>
     </div>
 </div>
-    
 <fieldset>
     <button class="primaryAction setupButton" type="submit">@T("Finish Setup")</button>
 </fieldset>