From 4a0b3f8468106d70f54f5353b48e1cc68a105094 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Tue, 9 Mar 2010 00:55:56 -0800
Subject: [PATCH] Adding some helpful focus the form functionality for logon
 and setup

--HG--
branch : dev
---
 src/Orchard.Web/Core/Themes/Scripts/base.js         | 13 ++++++++++---
 .../Modules/Orchard.Setup/Orchard.Setup.csproj      |  1 +
 .../Modules/Orchard.Setup/Scripts/setup.js          |  1 +
 .../Modules/Orchard.Users/Views/Account/LogOn.ascx  |  3 ++-
 .../Views/EditorTemplates/TinyMceTextEditor.ascx    |  4 +---
 src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx   |  6 ++++++
 6 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js

diff --git a/src/Orchard.Web/Core/Themes/Scripts/base.js b/src/Orchard.Web/Core/Themes/Scripts/base.js
index ecd6043b6..a19756dfe 100644
--- a/src/Orchard.Web/Core/Themes/Scripts/base.js
+++ b/src/Orchard.Web/Core/Themes/Scripts/base.js
@@ -1,8 +1,15 @@
 jQuery.fn.extend({
+    helpfullyFocus: function() {
+        var _this = $(this);
+        var firstError = _this.find(".input-validation-error").first();
+        return firstError.size() === 1
+            ? firstError.focus()
+            : _this.find("input:text").first().focus();
+    },
     toggleWhatYouControl: function() {
-        var _controller = $(this);
-        var _controllees = $("[data-controllerid=" + _controller.attr("id") + "]");
-        if (_controller.is(":checked")) {
+        var _this = $(this);
+        var _controllees = $("[data-controllerid=" + _this.attr("id") + "]");
+        if (_this.is(":checked")) {
             $(_controllees.slideDown(200)[0]).find("input").focus();
         } else {
             _controllees.slideUp(200);
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index d31d51b32..dfd2fa3dd 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -88,6 +88,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
+    <Content Include="Scripts\setup.js" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
new file mode 100644
index 000000000..a9c59453d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
@@ -0,0 +1 @@
+$("#SiteName").closest("form").helpfullyFocus();
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
index d850a88e2..55c6f8dba 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.ascx
@@ -24,4 +24,5 @@
             <%=Html.AntiForgeryTokenOrchard()%>
             <input type="submit" value="<%=_Encoded("Log On") %>" />
     </fieldset>
-<% } %>
\ No newline at end of file
+<% } %><%
+using (this.Capture("end-of-page-scripts")) { %><script type="text/javascript">$("#username").closest("form").helpfullyFocus();</script><% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx b/src/Orchard.Web/Modules/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
index 677466495..ef9fc941a 100644
--- a/src/Orchard.Web/Modules/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
+++ b/src/Orchard.Web/Modules/TinyMce/Views/EditorTemplates/TinyMceTextEditor.ascx
@@ -1,9 +1,7 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyEditorViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
 <% Html.RegisterScript("tiny_mce.js"); %>
-<%=Html.TextArea("Text", Model.Text, 25, 80, new { @class = "html" }) %>
-
-<%
+<%=Html.TextArea("Text", Model.Text, 25, 80, new { @class = "html" }) %><%
 using (this.Capture("end-of-page-scripts")) {%>
 <script type="text/javascript">
     tinyMCE.init({
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
index 7f587ed6d..a7f3ea4e2 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
@@ -1,4 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
+<%@ Import Namespace="Orchard.UI.Resources"%>
+<%@ Import Namespace="System.IO"%>
+<%@ Import Namespace="Orchard.Mvc.ViewEngines"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <%  //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...)
@@ -8,6 +11,9 @@
     var basejs = ResolveUrl("~/Core/Themes/Scripts/base.js");
     Model.Zones.AddAction("content:after", html =>
       html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + basejs + @"""></script>"));
+    var setupjs = ResolveUrl("~/Modules/Orchard.Setup/Scripts/setup.js");
+    Model.Zones.AddAction("content:after", html =>
+      html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src=""" + setupjs + @"""></script>"));
     var siteCss = ResolveUrl("../Styles/site.css");
     Model.Zones.AddAction("head:styles", html =>
       html.ViewContext.Writer.Write(@"<link rel=""stylesheet"" type=""text/css"" href=""" + siteCss + @"""/>"));