From 677d1973c248f0e4527c0cfa38623e1b844fd380 Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Fri, 7 Jun 2013 19:12:45 +0100 Subject: [PATCH] #19677: Change JS to click once loaded. Also added dependency. Fixed a styling issue too. Work Item: 19677 --HG-- branch : 1.x --- .../Modules/Orchard.Setup/Scripts/setup.js | 15 +++++++-------- .../Orchard.Setup/Views/Setup/Index.cshtml | 5 +++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js index 865d22b51..12f8786d6 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js +++ b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js @@ -13,11 +13,10 @@ } })(); -(function ($) { - $("select.recipe").change(function () { // class="recipe" on the select element - var description = $(this).find(":selected").attr("recipedescription"); // reads the html attribute of the selected option - $("#recipedescription").text(description); // make the contents of
be the escaped description string - }); -})(jQuery); - - +$(document).ready(function ($) { + $("select.recipe").change(function () { // class="recipe" on the select element + var description = $(this).find(":selected").attr("recipedescription"); // reads the html attribute of the selected option + $("#recipedescription").text(description); // make the contents of
be the escaped description string + }); + $(".data").find('input[name=DatabaseProvider]:checked').click(); +})(jQuery); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml index bccaff325..5be479cea 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml @@ -1,6 +1,7 @@ @model Orchard.Setup.ViewModels.SetupViewModel @{ Script.Require("jQuery"); + Script.Require("ShapesBase"); Script.Include("setup.js"); }

@Html.TitleForPage(T("Get Started").ToString())

@@ -19,11 +20,11 @@
- @Html.PasswordFor(svm => svm.AdminPassword) + @Html.PasswordFor(svm => svm.AdminPassword, new { @class = "text-box single-line" })
- @Html.PasswordFor(svm => svm.ConfirmPassword) + @Html.PasswordFor(svm => svm.ConfirmPassword, new { @class = "text-box single-line" })
if (!Model.DatabaseIsPreconfigured) {