yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Need to wrap the login javascript in a placeholder for Concorde

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-02-14 09:06:15 -01:00
parent b101e25e7a
commit 7640908781
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/login.aspx
View File

@@ -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 () {

2
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx
View File

@@ -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 () {

9
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.designer.cs generated
View File

@@ -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>