From 7640908781eeace0db212b686ad26ba7befd8ec5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 14 Feb 2013 09:06:15 -0100
Subject: [PATCH] Need to wrap the login javascript in a placeholder for
 Concorde

---
 src/Umbraco.Web.UI/umbraco/login.aspx                    | 2 ++
 src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx  | 2 ++
 .../umbraco.presentation/umbraco/login.aspx.designer.cs  | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/src/Umbraco.Web.UI/umbraco/login.aspx b/src/Umbraco.Web.UI/umbraco/login.aspx
index 4d7aa7a7d1..aa3955985c 100644
--- a/src/Umbraco.Web.UI/umbraco/login.aspx
+++ b/src/Umbraco.Web.UI/umbraco/login.aspx
@@ -109,11 +109,13 @@
     <asp:HiddenField ID="hf_height" runat="server" />
     <asp:HiddenField ID="hf_width" runat="server" />
     </form>
+    <asp:PlaceHolder ID="loginJavascript" runat="server">
     <script type="text/javascript">
         jQuery("#<%= lname.ClientID %>").focus();
         jQuery('#<%= hf_height.ClientID %>').value = getViewportHeight();
         jQuery('#<%= hf_width.ClientID %>').value = getViewportWidth();    
     </script>
+    </asp:PlaceHolder>
     <asp:PlaceHolder Visible="false" ID="loginError" runat="server">
         <script type="text/javascript">
             jQuery(document).ready(function () {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
index 4d7aa7a7d1..aa3955985c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
@@ -109,11 +109,13 @@
     <asp:HiddenField ID="hf_height" runat="server" />
     <asp:HiddenField ID="hf_width" runat="server" />
     </form>
+    <asp:PlaceHolder ID="loginJavascript" runat="server">
     <script type="text/javascript">
         jQuery("#<%= lname.ClientID %>").focus();
         jQuery('#<%= hf_height.ClientID %>').value = getViewportHeight();
         jQuery('#<%= hf_width.ClientID %>').value = getViewportWidth();    
     </script>
+    </asp:PlaceHolder>
     <asp:PlaceHolder Visible="false" ID="loginError" runat="server">
         <script type="text/javascript">
             jQuery(document).ready(function () {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs
index 33cc6357dd..5c5e67884d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs
@@ -156,6 +156,15 @@ namespace umbraco.cms.presentation {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hf_width;
         
+        /// <summary>
+        /// loginJavascript control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.PlaceHolder loginJavascript;
+        
         /// <summary>
         /// loginError control.
         /// </summary>