Skip to content

Commit fbd8725

Browse files
ScippyScippy
authored
Merge pull request #18 from Scippy/DNN9-Update
Dnn9 update and some improvments from scippy fork
2 parents 0bea05a + feef0f0 commit fbd8725

File tree

83 files changed

+3643
-1497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3643
-1497
lines changed

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,13 @@
2020
/Ventrian.PropertyAgent.v11.suo
2121
*.config
2222
/.vs/Ventrian.PropertyAgent/v14
23+
/.vs/Ventrian.PropertyAgent/v15
24+
/.vs/slnx.sqlite
25+
/.vs/VSWorkspaceState.json
26+
/Libraries/Dotnetnuke942.zip
27+
/Installs/PropertyAgent.01.10.00_DNN742_to_DNN932_Install
28+
/Libraries/DotNetNuke.Abstractions.dll
29+
/Libraries/Dotnetnuke943.zip
30+
/.vs/PropertyAgentSource/v16/.suo
31+
/.vs/Ventrian.PropertyAgent/v16/Server/sqlite3
32+
/.vs/Ventrian.PropertyAgent/v16/.suo

‎App_LocalResources/EditLayoutSettings.ascx.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,9 @@
297297
<data name="Standard.Text" xml:space="preserve">
298298
<value>Standard</value>
299299
</data>
300+
<data name="HTML5.Text" xml:space="preserve">
301+
<value>HTML5</value>
302+
</data>
300303
<data name="Name.Text" xml:space="preserve">
301304
<value>Name</value>
302305
</data>

‎CommentForm.ascx.vb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Namespace Ventrian.PropertyAgent
241241
End Sub
242242

243243
Private Sub cmdSubmit_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles cmdSubmit.Click
244-
244+
Dim hostSettings As Dictionary(Of String, String) = DotNetNuke.Entities.Controllers.HostController.Instance.GetSettingsDictionary()
245245
Try
246246

247247
lblSubmitResults.Text = String.Empty
@@ -278,7 +278,7 @@ Namespace Ventrian.PropertyAgent
278278
Dim objComment As New CommentInfo()
279279

280280
If (Me.Page.User.Identity.IsAuthenticated) Then
281-
objComment.UserID = UserController.GetCurrentUserInfo.UserID
281+
objComment.UserID = UserController.Instance.GetCurrentUserInfo.UserID
282282
Else
283283
objComment.UserID = Null.NullInteger
284284
End If
@@ -369,7 +369,7 @@ Namespace Ventrian.PropertyAgent
369369
DotNetNuke.Services.Mail.MailPriority.Normal,
370370
subject,
371371
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
372-
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), DotNetNuke.Entities.Host.Host.SMTPPassword)
372+
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), DotNetNuke.Entities.Host.Host.SMTPPassword)
373373

374374
Catch
375375
End Try
@@ -404,7 +404,7 @@ Namespace Ventrian.PropertyAgent
404404
DotNetNuke.Services.Mail.MailPriority.Normal,
405405
subject,
406406
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
407-
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), PortalSettings.HostSettings("SMTPPassword"))
407+
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), hostSettings("SMTPPassword"))
408408

409409
Catch
410410
End Try
@@ -438,7 +438,7 @@ Namespace Ventrian.PropertyAgent
438438
DotNetNuke.Services.Mail.MailPriority.Normal,
439439
subject,
440440
DotNetNuke.Services.Mail.MailFormat.Text, System.Text.Encoding.UTF8, body,
441-
"", PortalSettings.HostSettings("SMTPServer"), PortalSettings.HostSettings("SMTPAuthentication"), PortalSettings.HostSettings("SMTPUsername"), PortalSettings.HostSettings("SMTPPassword"))
441+
"", hostSettings("SMTPServer"), hostSettings("SMTPAuthentication"), hostSettings("SMTPUsername"), hostSettings("SMTPPassword"))
442442

443443
Catch
444444
End Try

‎ContactForm.ascx‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,52 @@
22
<%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls" %>
33
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
44
<%@ Register Assembly="Menulab.FlexCaptcha" Namespace="Menulab" TagPrefix="ml" %>
5-
6-
<asp:PlaceHolder id="phContactForm" runat="server" Visible="True">
7-
<asp:Table id="tblContactForm" runat="server">
5+
<asp:Table id="tblContactForm" runat="server">
86
<asp:TableRow>
97
<asp:TableCell>
10-
<table id="tblContactFormDesign" cellSpacing="2" cellPadding="2" summary="ContactForm Design Table"
11-
border="0" width="100%">
12-
<asp:repeater id="rptDetails" Runat="server">
13-
<ItemTemplate>
14-
<tr valign="top">
15-
<td class="SubHead" valign="middle" nowrap>
16-
<label id="label" runat="server">
17-
<asp:linkbutton id="cmdHelp" tabindex="-1" runat="server" CausesValidation="False" enableviewstate="False">
18-
<asp:image id="imgHelp" tabindex="-1" runat="server" imageurl="~/images/help.gif" enableviewstate="False"></asp:image>
19-
</asp:linkbutton>
20-
<asp:label id="lblLabel" runat="server" enableviewstate="False"></asp:label>
21-
</label>
22-
<asp:panel id="pnlHelp" runat="server" cssClass="Help" enableviewstate="False">
23-
<asp:label id="lblHelp" runat="server" enableviewstate="False"></asp:label>
24-
</asp:panel>
25-
</td>
26-
<td align="left" width="100%">
27-
<asp:PlaceHolder ID="phValue" Runat="server" />
28-
</td>
29-
</tr>
30-
</ItemTemplate>
31-
</asp:repeater>
32-
<tr valign="top" id="trCaptcha" runat="Server">
33-
<td class="SubHead">
34-
<dnn:label id="plCaptcha" resourcekey="Captcha" runat="server" controlname="ctlCaptcha" suffix=":"></dnn:label>
35-
</td>
36-
<td align="left">
37-
<ml:FlexCaptcha ID="mlFlexCaptcha" runat="server" />
38-
</td>
39-
</tr>
40-
<tr valign="top">
41-
<td colspan="2" align="center">
42-
<asp:LinkButton id="cmdSubmit" runat="server" CssClass="CommandButton" BorderStyle="None">Submit</asp:LinkButton><br />
43-
<asp:label id="lblRequireFields" runat="server" CssClass="Normal" ResourceKey="RequiredFields"></asp:label>
44-
</td>
45-
</tr>
46-
<tr valign="top">
47-
<td colspan="2" align="center">
48-
<asp:label id="lblSubmitResults" runat="server" CssClass="NormalRed"></asp:label>
49-
</td>
50-
</tr>
51-
</table>
8+
9+
<asp:PlaceHolder id="phContactForm" runat="server" Visible="True">
10+
<div class="row ContactFormBody">
11+
<asp:repeater id="rptDetails" Runat="server">
12+
<ItemTemplate>
13+
14+
<div class="col-sm-4 ContactFormLabel">
15+
<label id="label" runat="server">
16+
<asp:linkbutton id="cmdHelp" tabindex="-1" runat="server" CausesValidation="False" enableviewstate="False">
17+
<asp:image id="imgHelp" tabindex="-1" runat="server" imageurl="~/images/help.gif" enableviewstate="False"></asp:image>
18+
</asp:linkbutton>
19+
<asp:label id="lblLabel" runat="server" enableviewstate="False"></asp:label>
20+
</label>
21+
<asp:panel id="pnlHelp" runat="server" cssClass="Help" enableviewstate="False">
22+
<asp:label id="lblHelp" runat="server" enableviewstate="False"></asp:label>
23+
</asp:panel>
24+
</div>
25+
<div class="col-sm-8 ContactFormTextBox">
26+
<asp:PlaceHolder ID="phValue" Runat="server" />
27+
</div>
28+
</ItemTemplate>
29+
</asp:repeater>
30+
31+
<table class="ContactFormCaptcha">
32+
<tr valign="top" id="trCaptcha" runat="Server">
33+
<td>
34+
<div>
35+
<dnn:label id="plCaptcha" resourcekey="Captcha" runat="server" controlname="ctlCaptcha" suffix=":"></dnn:label>
36+
<ml:FlexCaptcha ID="mlFlexCaptcha" runat="server" />
37+
</div>
38+
</td>
39+
</tr>
40+
</table>
41+
<div class="row ContactFormSubmit">
42+
<asp:LinkButton id="cmdSubmit" runat="server" CssClass="CommandButton" BorderStyle="None">Submit</asp:LinkButton><br />
43+
<asp:label id="lblRequireFields" runat="server" CssClass="Normal" ResourceKey="RequiredFields"></asp:label>
44+
</div>
45+
<div class="row ContactFormResult">
46+
<asp:label id="lblSubmitResults" runat="server" CssClass="NormalRed"></asp:label>
47+
</div>
48+
</div>
49+
</asp:PlaceHolder>
50+
5251
</asp:TableCell>
5352
</asp:TableRow>
54-
</asp:Table>
55-
</asp:PlaceHolder>
53+
</asp:Table>

‎ContactForm.ascx.designer.vb‎

Lines changed: 44 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)