diff --git a/App_LocalResources/Settings.ascx.resx b/App_LocalResources/Settings.ascx.resx index 7ee8a2b..d1503d7 100644 --- a/App_LocalResources/Settings.ascx.resx +++ b/App_LocalResources/Settings.ascx.resx @@ -652,4 +652,70 @@ Send Copy </strong>&ndash; Enabling this option allows a copy of the f <br />If you enable google NoCaptcha, you need to provide the Site Key + + Subject Field Placeholder + + + Add Subject PlaceHoder Here + + + Email Field Placeholder + + + Add Email PlaceHoder Here + + + Email Confirm Field Placeholder + + + Add Email Confirm PlaceHoder Here + + + Name Field Placeholder + + + Add Name PlaceHoder Here + + + Street Field Placeholder + + + Add Street PlaceHoder Here + + + City Field Placeholder + + + Add City PlaceHoder Here + + + Region Field Placeholder + + + Add Region PlaceHoder Here + + + Country Field Placeholder + + + Add Country PlaceHoder Here + + + Postal Code Field Placeholder + + + Add Postal Code PlaceHoder Here + + + Telephone Code Field Placeholder + + + Add Telephone Code PlaceHoder Here + + + Message Code Field Placeholder + + + Add Message Code PlaceHoder Here + \ No newline at end of file diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 48c3b2d..331fbdc 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: - + diff --git a/Components/Configuration.vb b/Components/Configuration.vb index 6c24d2c..d969039 100644 --- a/Components/Configuration.vb +++ b/Components/Configuration.vb @@ -101,6 +101,7 @@ Namespace DotNetNuke.Modules.Feedback Private _labelDisplayPosition As LabelDisplayPositions Private _width As System.Web.UI.WebControls.Unit Private _rows As Integer + Private _captchaVisibility As CaptchaVisibilities Private _captchaAudio As Boolean Private _captchaCase As Boolean @@ -111,6 +112,19 @@ Namespace DotNetNuke.Modules.Feedback Private _subjectFieldType As SubjectFieldTypes Private _subject As String + + Private _subjectplaceholder As String + Private _emailplaceholder As String + Private _confirmemailplaceholder As String + Private _nameplaceholder As String + Private _streetplaceholder As String + Private _cityplaceholder As String + Private _regionplaceholder As String + Private _countryplaceholder As String + Private _postalcodeplaceholder As String + Private _telephoneplaceholder As String + Private _messageplaceholder As String + Private _sendTo As String Private _sendToRoles As String Private _sendFrom As String @@ -381,6 +395,7 @@ Namespace DotNetNuke.Modules.Feedback End Set End Property + Public Property CaptchaVisibility() As CaptchaVisibilities Get Return _captchaVisibility @@ -711,6 +726,96 @@ Namespace DotNetNuke.Modules.Feedback _akismetSendModerator = value End Set End Property + Public Property SubjectPlaceholder() As String + Get + Return _subjectplaceholder + End Get + Set(ByVal value As String) + _subjectplaceholder = value + End Set + End Property + + Public Property EmailPlaceholder() As String + Get + Return _emailplaceholder + End Get + Set(ByVal value As String) + _emailplaceholder = value + End Set + End Property + Public Property ConfirmEmailPlaceholder() As String + Get + Return _confirmemailplaceholder + End Get + Set(ByVal value As String) + _confirmemailplaceholder = value + End Set + End Property + Public Property NamePlaceholder() As String + Get + Return _nameplaceholder + End Get + Set(ByVal value As String) + _nameplaceholder = value + End Set + End Property + Public Property StreetPlaceholder() As String + Get + Return _streetplaceholder + End Get + Set(ByVal value As String) + _streetplaceholder = value + End Set + End Property + Public Property CityPlaceholder() As String + Get + Return _cityplaceholder + End Get + Set(ByVal value As String) + _cityplaceholder = value + End Set + End Property + Public Property RegionPlaceholder() As String + Get + Return _regionplaceholder + End Get + Set(ByVal value As String) + _regionplaceholder = value + End Set + End Property + Public Property CountryPlaceholder() As String + Get + Return _countryplaceholder + End Get + Set(ByVal value As String) + _countryplaceholder = value + End Set + End Property + Public Property PostalCodePlaceholder() As String + Get + Return _postalcodeplaceholder + End Get + Set(ByVal value As String) + _postalcodeplaceholder = value + End Set + End Property + Public Property TelephonePlaceholder() As String + Get + Return _telephoneplaceholder + End Get + Set(ByVal value As String) + _telephoneplaceholder = value + End Set + End Property + Public Property MessagePlaceholder() As String + Get + Return _messageplaceholder + End Get + Set(ByVal value As String) + _messageplaceholder = value + End Set + End Property + #End Region @@ -829,6 +934,17 @@ Namespace DotNetNuke.Modules.Feedback _akismetEnable = GetSetting("Feedback_AkismetEnable", False) _akismetKey = GetSetting("Feedback_AkismetKey", String.Empty) _akismetSendModerator = GetSetting("Feedback_AkismetSendModerator", False) + _subjectplaceholder = GetSetting("Feedback_SubjectPlaceholder", String.Empty).ToString + _emailplaceholder = GetSetting("Feedback_EmailPlaceholder", String.Empty).ToString + _confirmemailplaceholder = GetSetting("Feedback_ConfirmEmailPlaceholder", String.Empty).ToString + _nameplaceholder = GetSetting("Feedback_NamePlaceholder", String.Empty).ToString + _streetplaceholder = GetSetting("Feedback_StreetPlaceholder", String.Empty).ToString + _cityplaceholder = GetSetting("Feedback_CityPlaceholder", String.Empty).ToString + _regionplaceholder = GetSetting("Feedback_RegionPlaceholder", String.Empty).ToString + _countryplaceholder = GetSetting("Feedback_CountryPlaceholder", String.Empty).ToString + _postalcodeplaceholder = GetSetting("Feedback_PostalCodePlaceholder", String.Empty).ToString + _telephoneplaceholder = GetSetting("Feedback_TelephonePlaceholder", String.Empty).ToString + _messageplaceholder = GetSetting("Feedback_MessagePlaceholder", String.Empty).ToString End If End Sub @@ -979,6 +1095,17 @@ Namespace DotNetNuke.Modules.Feedback .UpdateModuleSetting(_moduleId, "Feedback_NoCaptchaSiteKey", _noCaptchaSiteKey) .UpdateModuleSetting(_moduleId, "Feedback_NoCaptchaSecretKey", _noCaptchaSecretKey) + .UpdateModuleSetting(_moduleId, "Feedback_SubjectPlaceholder", _subjectplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_EmailPlaceholder", _emailplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_ConfirmEmailPlaceholder", _confirmemailplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_NamePlaceholder", _nameplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_StreetPlaceholder", _streetplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_CityPlaceholder", _cityplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_RegionPlaceholder", _regionplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_CountryPlaceholder", _countryplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_PostalCodePlaceholder", _postalcodeplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_TelephonePlaceholder", _telephoneplaceholder) + .UpdateModuleSetting(_moduleId, "Feedback_MessagePlaceholder", _messageplaceholder) End With Entities.Modules.ModuleController.SynchronizeModule(_moduleId) diff --git a/Components/FeedbackInfo.vb b/Components/FeedbackInfo.vb index 238889a..a0956aa 100644 --- a/Components/FeedbackInfo.vb +++ b/Components/FeedbackInfo.vb @@ -62,6 +62,17 @@ Namespace DotNetNuke.Modules.Feedback Private _userAgent As String Private _contextKey As String Private _displayCreatedOnDate As DateTime + Private _subjectplaceholder As String + Private _emailplaceholder As String + Private _confirmemailplaceholder As String + Private _nameplaceholder As String + Private _streetplaceholder As String + Private _cityplaceholder As String + Private _regionplaceholder As String + Private _countryplaceholder As String + Private _postalcodeplaceholder As String + Private _telephoneplaceholder As String + Private _messageplaceholder As String #End Region @@ -139,6 +150,7 @@ Namespace DotNetNuke.Modules.Feedback End Set End Property + Public Property Message() As String Get Return _message @@ -292,6 +304,106 @@ Namespace DotNetNuke.Modules.Feedback End Set End Property + Public Property SubjectPlaceholder() As String + Get + Return _subjectplaceholder + End Get + Set(ByVal value As String) + _subjectplaceholder = value + End Set + End Property + + Public Property EmailPlaceholder() As String + Get + Return _emailplaceholder + End Get + Set(ByVal value As String) + _emailplaceholder = value + End Set + End Property + Public Property ConfirmEmailPlaceholder() As String + Get + Return _confirmemailplaceholder + End Get + Set(ByVal value As String) + _confirmemailplaceholder = value + End Set + End Property + Public Property NamePlaceholder() As String + Get + Return _nameplaceholder + End Get + Set(ByVal value As String) + _nameplaceholder = value + End Set + End Property + Public Property StreetPlaceholder() As String + Get + Return _streetplaceholder + End Get + Set(ByVal value As String) + _streetplaceholder = value + End Set + End Property + Public Property CityPlaceholder() As String + Get + Return _cityplaceholder + End Get + Set(ByVal value As String) + _cityplaceholder = value + End Set + End Property + Public Property RegionPlaceholder() As String + Get + Return _regionplaceholder + End Get + Set(ByVal value As String) + _regionplaceholder = value + End Set + End Property + Public Property CountryPlaceholder() As String + Get + Return _countryplaceholder + End Get + Set(ByVal value As String) + _countryplaceholder = value + End Set + End Property + Public Property PostalCodePlaceholder() As String + Get + Return _postalcodeplaceholder + End Get + Set(ByVal value As String) + _postalcodeplaceholder = value + End Set + End Property + Public Property TelephonePlaceholder() As String + Get + Return _telephoneplaceholder + End Get + Set(ByVal value As String) + _telephoneplaceholder = value + End Set + End Property + Public Property MessagePlaceholder() As String + Get + Return _messageplaceholder + End Get + Set(ByVal value As String) + _messageplaceholder = value + End Set + End Property + + + + + + + + + + + #End Region @@ -324,6 +436,18 @@ Namespace DotNetNuke.Modules.Feedback Referrer = Null.SetNullString(dr("Referrer")) UserAgent = Null.SetNullString(dr("UserAgent")) ContextKey = Null.SetNullString(dr("ContextKey")) + SubjectPlaceholder = Null.SetNullString(dr("SubjectPlaceholder")) + EmailPlaceholder = Null.SetNullString(dr("EmailPlaceholder")) + ConfirmEmailPlaceholder = Null.SetNullString(dr("ConfirmEmailPlaceholder")) + NamePlaceholder = Null.SetNullString(dr("NamePlaceholder")) + StreetPlaceholder = Null.SetNullString(dr("StreetPlaceholder")) + CityPlaceholder = Null.SetNullString(dr("CityPlaceholder")) + RegionPlaceholder = Null.SetNullString(dr("RegionPlaceholder")) + CountryPlaceholder = Null.SetNullString(dr("CountryPlaceholder")) + PostalCodePlaceholder = Null.SetNullString(dr("PostalCodePlaceholder")) + TelephonePlaceholder = Null.SetNullString(dr("TelephonePlaceholder")) + MessagePlaceholder = Null.SetNullString(dr("MessagePlaceholder")) + End With End Sub @@ -373,7 +497,7 @@ Namespace DotNetNuke.Modules.Feedback Case "status" publicProperty = True : PropertyNotFound = False : result = Localization.GetString(Status.ToString, Configuration.SharedResources) Case "subject" - publicProperty = True : PropertyNotFound = False : result = PropertyAccess.FormatString(Subject, strFormat) + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(Subject, strFormat) Case "message" publicProperty = True : PropertyNotFound = False : result = PropertyAccess.FormatString(Message, strFormat) Case "sendername" @@ -419,11 +543,34 @@ Namespace DotNetNuke.Modules.Feedback Case "referrer" publicProperty = True : PropertyNotFound = False : result = PropertyAccess.FormatString(Referrer, strFormat) Case "useragent" - publicProperty = True : PropertyNotFound = False : result = PropertyAccess.FormatString(UserAgent, strFormat) + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(UserAgent, strFormat) + Case "SubjectPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(SubjectPlaceholder, strFormat) + Case "EmailPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(EmailPlaceholder, strFormat) + Case "ConfirmEmailPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(ConfirmEmailPlaceholder, strFormat) + Case "NamePlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(NamePlaceholder, strFormat) + Case "StreetPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(StreetPlaceholder, strFormat) + Case "CityPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(CityPlaceholder, strFormat) + Case "RegionPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(RegionPlaceholder, strFormat) + Case "CountryPlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(CountryPlaceholder, strFormat) + Case "PostalCodePlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(PostalCodePlaceholder, strFormat) + Case "TelephonePlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(TelephonePlaceholder, strFormat) + Case "MessagePlaceholder" + publicProperty = True : propertyNotFound = False : result = PropertyAccess.FormatString(MessagePlaceholder, strFormat) Case Else PropertyNotFound = True End Select + If Not publicProperty And accessLevel <> Scope.Debug Then PropertyNotFound = True result = PropertyAccess.ContentLocked diff --git a/Feedback.ascx.vb b/Feedback.ascx.vb index 386beeb..42861ea 100644 --- a/Feedback.ascx.vb +++ b/Feedback.ascx.vb @@ -125,6 +125,17 @@ Namespace DotNetNuke.Modules.Feedback Try GetUser() txtSubject2.Text = "" + txtSubject2.Attributes.Add("placeholder", MyConfiguration.SubjectPlaceholder) + txtBody.Attributes.Add("placeholder", MyConfiguration.MessagePlaceholder) + txtEmail.Attributes.Add("placeholder", MyConfiguration.EmailPlaceholder) + txtEmailConfirm.Attributes.Add("placeholder", MyConfiguration.ConfirmEmailPlaceholder) + txtName.Attributes.Add("placeholder", MyConfiguration.NamePlaceholder) + txtStreet.Attributes.Add("placeholder", MyConfiguration.StreetPlaceholder) + txtCity.Attributes.Add("placeholder", MyConfiguration.CityPlaceholder) + txtRegion.Attributes.Add("placeholder", MyConfiguration.RegionPlaceholder) + txtCountry.Attributes.Add("placeholder", MyConfiguration.CountryPlaceholder) + txtPostalCode.Attributes.Add("placeholder", MyConfiguration.PostalCodePlaceholder) + txtTelephone.Attributes.Add("placeholder", MyConfiguration.TelephonePlaceholder) txtBody.Text = "" chkCopy.Checked = True divFeedbackFormContent.Visible = True @@ -345,6 +356,18 @@ Namespace DotNetNuke.Modules.Feedback End If Dim subject As String = MyConfiguration.Subject + Dim SubjectPlaceholder As String = MyConfiguration.SubjectPlaceholder + + Dim EmailPlaceholder As String = MyConfiguration.EmailPlaceholder + Dim ConfirmEmailPlaceholder As String = MyConfiguration.ConfirmEmailPlaceholder + Dim NamePlaceholder As String = MyConfiguration.NamePlaceholder + Dim StreetPlaceholder As String = MyConfiguration.StreetPlaceholder + Dim CityPlaceholder As String = MyConfiguration.CityPlaceholder + Dim RegionPlaceholder As String = MyConfiguration.RegionPlaceholder + Dim CountryPlaceholder As String = MyConfiguration.CountryPlaceholder + Dim PostalCodePlaceholder As String = MyConfiguration.PostalCodePlaceholder + Dim TelephonePlaceholder As String = MyConfiguration.TelephonePlaceholder + Dim MessagePlaceholder As String = MyConfiguration.MessagePlaceholder 'Set both rows to false and then show one based on whether the values from the settings are correct. divSubject.Visible = False @@ -548,8 +571,8 @@ Namespace DotNetNuke.Modules.Feedback End If ElseIf divSubject2.Visible Then 'grab it from the text box. - oFeedback.Subject = objPortalSecurity.InputFilter(txtSubject2.Text, _ - PortalSecurity.FilterFlag.NoScripting Or _ + oFeedback.Subject = objPortalSecurity.InputFilter(txtSubject2.Text, + PortalSecurity.FilterFlag.NoScripting Or PortalSecurity.FilterFlag.NoMarkup) Else 'The admin might have chosen a subject but not made it visible. diff --git a/Settings.ascx b/Settings.ascx index b39720e..6b9238e 100644 --- a/Settings.ascx +++ b/Settings.ascx @@ -85,47 +85,91 @@ + +
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+ + +
+
+ + +
+
+ + +

diff --git a/Settings.ascx.designer.vb b/Settings.ascx.designer.vb index 39041ac..fd46b1f 100644 --- a/Settings.ascx.designer.vb +++ b/Settings.ascx.designer.vb @@ -320,6 +320,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblSubjectEditField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plSubjectEditFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plSubjectEditFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtSubjectEditFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtSubjectEditFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plEmailField control. ''' @@ -338,6 +356,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblEmailField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plEmailFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plEmailFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtEmailFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtEmailFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plEmailConfirmField control. ''' @@ -356,6 +392,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblEmailConfirmField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plEmailConfirmFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plEmailConfirmFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtEmailConfirmFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtEmailConfirmFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plNameField control. ''' @@ -374,6 +428,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblNameField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plNameFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plNameFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtNameFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtNameFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plStreetField control. ''' @@ -392,6 +464,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblStreetField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plStreetFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plStreetFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtStreetFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtStreetFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plCityField control. ''' @@ -410,6 +500,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblCityField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plCityFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plCityFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtCityFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtCityFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plRegionField control. ''' @@ -428,6 +536,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblRegionField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plRegionFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plRegionFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtRegionFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtRegionFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plCountryField control. ''' @@ -446,6 +572,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblCountryField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plCountryFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plCountryFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtCountryFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtCountryFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plPostalCodeField control. ''' @@ -464,6 +608,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblPostalCodeField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plPostalCodeFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plPostalCodeFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtPostalCodeFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtPostalCodeFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plTelephoneField control. ''' @@ -482,6 +644,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblTelephoneField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plTelephoneFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plTelephoneFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtTelephoneFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtTelephoneFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plMessageField control. ''' @@ -500,6 +680,24 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblMessageField As Global.System.Web.UI.WebControls.RadioButtonList + ''' + '''plMessageFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents plMessageFieldPlaceholder As Global.System.Web.UI.UserControl + + ''' + '''txtMessageFieldPlaceholder control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents txtMessageFieldPlaceholder As Global.System.Web.UI.WebControls.TextBox + ''' '''plEmailRegex control. ''' diff --git a/Settings.ascx.vb b/Settings.ascx.vb index 3c707e2..d085bb8 100644 --- a/Settings.ascx.vb +++ b/Settings.ascx.vb @@ -164,6 +164,19 @@ Namespace DotNetNuke.Modules.Feedback rblLabelDisplay.SelectedValue = CInt(MyConfiguration.LabelDisplayPosition).ToString txtWidth.Text = MyConfiguration.Width.ToString.Replace("px", "") txtrows.Text = MyConfiguration.Rows.ToString + + txtSubjectEditFieldPlaceholder.Text = MyConfiguration.SubjectPlaceholder.ToString + txtEmailFieldPlaceholder.Text = MyConfiguration.EmailPlaceholder.ToString + txtEmailConfirmFieldPlaceholder.Text = MyConfiguration.ConfirmEmailPlaceholder.ToString + txtNameFieldPlaceholder.Text = MyConfiguration.NamePlaceholder.ToString + txtStreetFieldPlaceholder.Text = MyConfiguration.StreetPlaceholder.ToString + txtCityFieldPlaceholder.Text = MyConfiguration.CityPlaceholder.ToString + txtRegionFieldPlaceholder.Text = MyConfiguration.RegionPlaceholder.ToString + txtCountryFieldPlaceholder.Text = MyConfiguration.CountryPlaceholder.ToString + txtPostalCodeFieldPlaceholder.Text = MyConfiguration.PostalCodePlaceholder.ToString + txtTelephoneFieldPlaceholder.Text = MyConfiguration.TelephonePlaceholder.ToString + txtMessageFieldPlaceholder.Text = MyConfiguration.MessagePlaceholder.ToString + txtMaxMessage.Text = MyConfiguration.MaxMessage.ToString rblSubjectEditField.SelectedValue = CInt(MyConfiguration.SubjectFieldType).ToString @@ -303,8 +316,22 @@ Namespace DotNetNuke.Modules.Feedback .LabelDisplayPosition = CType(rblLabelDisplay.SelectedValue, Configuration.LabelDisplayPositions) .Width = Unit.Parse(txtWidth.Text) .Rows = Integer.Parse(txtrows.Text) + + .MaxMessage = Integer.Parse(txtMaxMessage.Text) .Subject = cboSubject.SelectedItem.Value + .SubjectPlaceholder = (txtSubjectEditFieldPlaceholder.Text).ToString + .EmailPlaceholder = (txtEmailFieldPlaceholder.Text).ToString + .ConfirmEmailPlaceholder = (txtEmailConfirmFieldPlaceholder.Text).ToString + .NamePlaceholder = (txtNameFieldPlaceholder.Text).ToString + .StreetPlaceholder = (txtStreetFieldPlaceholder.Text).ToString + .CityPlaceholder = (txtCityFieldPlaceholder.Text).ToString + .RegionPlaceholder = (txtRegionFieldPlaceholder.Text).ToString + .CountryPlaceholder = (txtCountryFieldPlaceholder.Text).ToString + .PostalCodePlaceholder = (txtPostalCodeFieldPlaceholder.Text).ToString + .TelephonePlaceholder = (txtTelephoneFieldPlaceholder.Text).ToString + .MessagePlaceholder = (txtMessageFieldPlaceholder.Text).ToString + .SubjectFieldType = CType(rblSubjectEditField.SelectedValue, Configuration.SubjectFieldTypes) .SendCopy = chkSendCopy.Checked .OptOut = chkOptout.Checked diff --git a/_buildfiles/version.txt b/_buildfiles/version.txt index c186a67..71265cb 100644 --- a/_buildfiles/version.txt +++ b/_buildfiles/version.txt @@ -1 +1 @@ -6.7.0.22 \ No newline at end of file +6.7.0.43 \ No newline at end of file