From b2facd203587dfdc88985e12bfcb765c0a44a54a Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Mon, 4 Jun 2018 13:41:14 -0700 Subject: [PATCH 1/2] Resolves issue #4 The tab container DIV that Yetii expected was in the wrong hierarchy in the markup. --- EditParameter.ascx | 39 ++++-- EditParameter.ascx.designer.cs | 248 +++++++++++++++------------------ 2 files changed, 139 insertions(+), 148 deletions(-) diff --git a/EditParameter.ascx b/EditParameter.ascx index ec576ab..38f3be8 100644 --- a/EditParameter.ascx +++ b/EditParameter.ascx @@ -2,11 +2,11 @@ <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
diff --git a/EditParameter.ascx.designer.cs b/EditParameter.ascx.designer.cs index 2a8c758..08a8279 100644 --- a/EditParameter.ascx.designer.cs +++ b/EditParameter.ascx.designer.cs @@ -1,143 +1,123 @@ - -using DotNetNuke.Services.Localization; - using System; -using System.Web; -using System.ComponentModel; -using Microsoft.VisualBasic; -using System.Web.UI.WebControls; -using System.Collections; -using System.Web.UI.HtmlControls; -using System.Web.UI; -using System.Data.SqlClient; -using System.Data; -using DotNetNuke.UI.UserControls; - - - - //------------------------------------------------------------------------------ // // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ - -namespace DNNStuff.SQLViewPro -{ - - public partial class EditParameter - { - - /// - ///lblParameterType control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected LabelControl lblParameterType; - - /// - ///ddParameterType control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.DropDownList ddParameterType; - - /// - ///lblName control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected LabelControl lblName; - - /// - ///txtName control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.TextBox txtName; - - /// - ///txtName_Required control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.RequiredFieldValidator txtName_Required; - - /// - ///lblCaption control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected LabelControl lblCaption; - - /// - ///txtCaption control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.TextBox txtCaption; - - /// - ///txtCaption_Required control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.RequiredFieldValidator txtCaption_Required; - - /// - ///lblParameterTypeSettingsHeader control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected LabelControl lblParameterTypeSettingsHeader; - - /// - ///phParameterSettings control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.PlaceHolder phParameterSettings; - - /// - ///cmdUpdate control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.LinkButton cmdUpdate; - - /// - ///cmdCancel control. - /// - /// - ///Auto-generated field. - ///To modify move field declaration from designer file to code-behind file. - /// - protected System.Web.UI.WebControls.LinkButton cmdCancel; - } +namespace DNNStuff.SQLViewPro { + + + public partial class EditParameter { + + /// + /// lblParameterType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UserControl lblParameterType; + + /// + /// ddParameterType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddParameterType; + + /// + /// lblName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UserControl lblName; + + /// + /// txtName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtName; + + /// + /// txtName_Required control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator txtName_Required; + + /// + /// lblCaption control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UserControl lblCaption; + + /// + /// txtCaption control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCaption; + + /// + /// txtCaption_Required control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator txtCaption_Required; + + /// + /// lblParameterTypeSettingsHeader control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UserControl lblParameterTypeSettingsHeader; + + /// + /// phParameterSettings control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder phParameterSettings; + + /// + /// cmdUpdate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton cmdUpdate; + + /// + /// cmdCancel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton cmdCancel; + } } - From 2d377c2dcec61789be3701bbd1eb7af6606354f6 Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Mon, 4 Jun 2018 13:51:38 -0700 Subject: [PATCH 2/2] Missed a function reference. Whoops! :) --- EditParameter.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EditParameter.ascx b/EditParameter.ascx index 38f3be8..18c0548 100644 --- a/EditParameter.ascx +++ b/EditParameter.ascx @@ -48,7 +48,7 @@ $(document).ready(function () { setupParamForm(); Sys.WebForms.PageRequestManager.getInstance().add_endRequest(function () { - setupDnnSiteSettings(); + setupParamForm(); }); }); }(jQuery, window.Sys));