Skip to content

Commit 9978ce0

Browse files
authored
Merge pull request #1315 from DNNCommunity/dev
Syncing branches for 08.02.05 GA
2 parents 00a4041 + 0e8fa55 commit 9978ce0

10 files changed

+51
-70
lines changed

Dnn.CommunityForums/Classic.ascx.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ protected override void OnLoad(EventArgs e)
5959
{
6060
base.OnLoad(e);
6161

62-
this.SocialGroupId = -1;
63-
if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
64-
{
65-
this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
66-
}
67-
this.SetupPage();
68-
6962
#if DEBUG
7063
//ForumsConfig.Install_Upgrade_CreateForumDefaultSettingsAndSecurity_080200();
7164
//new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().RemoveUnused(this.ForumModuleId);
@@ -84,6 +77,11 @@ protected override void OnLoad(EventArgs e)
8477
this.ForumModuleId = this.ModuleId;
8578
}
8679

80+
this.SocialGroupId = -1;
81+
if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
82+
{
83+
this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
84+
}
8785
string ctl = this.DefaultView;
8886
string opts = string.Empty;
8987

@@ -130,6 +128,7 @@ protected override void OnLoad(EventArgs e)
130128
}
131129

132130
this.currView = ctl;
131+
this.SetupPage();
133132
this.GetControl(ctl, opts);
134133

135134
if (this.Request.IsAuthenticated)
@@ -142,6 +141,7 @@ protected override void OnLoad(EventArgs e)
142141
}
143142
else
144143
{
144+
this.ShowToolbar = false;
145145
string ctlPath = Globals.ModulePath + "controls/_default.ascx";
146146
ForumBase ctlDefault = (ForumBase)this.LoadControl(ctlPath);
147147
ctlDefault.ID = "ctlConfig";

Dnn.CommunityForums/Controllers/PermissionController.cs

+12
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,18 @@ internal static string GetUsersRoleIds(int PortalId, DotNetNuke.Entities.Users.U
572572
}
573573
}
574574

575+
roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleAllUsers));
576+
if (u.UserID < 0)
577+
{
578+
roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));
579+
}
580+
581+
if (u.IsSuperUser)
582+
{
583+
roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));
584+
roles.Add(DotNetNuke.Modules.ActiveForums.Utilities.GetPortalSettings(PortalId).AdministratorRoleId);
585+
}
586+
575587
return string.Join(";", roles.ToArray());
576588
}
577589

Dnn.CommunityForums/DnnCommunityForums.dnn

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums" type="Module" version="08.02.04">
3+
<package name="Active Forums" type="Module" version="08.02.05">
44
<friendlyName>DNN Community Forums</friendlyName>
55
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
@@ -86,7 +86,7 @@
8686
<assembly>
8787
<name>DotNetNuke.Modules.ActiveForums.dll</name>
8888
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
89-
<version>08.02.04</version>
89+
<version>08.02.05</version>
9090
</assembly>
9191
</assemblies>
9292
</component>
@@ -417,7 +417,7 @@
417417
<script type="UnInstall">
418418
<path>sql</path>
419419
<name>Uninstall.SqlDataProvider</name>
420-
<version>08.02.04</version>
420+
<version>08.02.05</version>
421421
</script>
422422
</scripts>
423423
</component>
@@ -460,7 +460,7 @@
460460
</components>
461461
</package>
462462

463-
<package name="Active Forums What's New" type="Module" version="08.02.04">
463+
<package name="Active Forums What's New" type="Module" version="08.02.05">
464464

465465
<friendlyName>DNN Community Forums What's New</friendlyName>
466466
<foldername>ActiveForumsWhatsNew</foldername>
@@ -530,7 +530,7 @@
530530
</components>
531531
</package>
532532

533-
<package name="Active Forums Viewer" type="Module" version="08.02.04">
533+
<package name="Active Forums Viewer" type="Module" version="08.02.05">
534534
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
535535
<foldername>ActiveForumsViewer</foldername>
536536
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>

Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Active Forums_Symbols" type="Library" version="08.02.04">
3+
<package name="Active Forums_Symbols" type="Library" version="08.02.05">
44

55
<friendlyName>DNN Community Forums Symbols</friendlyName>
66
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
@@ -15,7 +15,7 @@
1515
<releaseNotes src="ReleaseNotes.txt" />
1616
<azureCompatible>True</azureCompatible>
1717
<dependencies>
18-
<dependency type="managedPackage" version="8.2.4">Active Forums</dependency>
18+
<dependency type="managedPackage" version="8.2.5">Active Forums</dependency>
1919
</dependencies>
2020
<components>
2121
<component type="ResourceFile">

Dnn.CommunityForums/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
// You can specify all the values or you can default the Build and Revision Numbers
5353
// by using the '*' as shown below:
5454

55-
[assembly: AssemblyVersion("08.02.04")]
55+
[assembly: AssemblyVersion("08.02.05")]
5656

57-
[assembly: AssemblyFileVersion("08.02.04")]
57+
[assembly: AssemblyFileVersion("08.02.05")]
5858

5959
[assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]
6060
[assembly: WebResource("DotNetNuke.Modules.ActiveForums.scripts.afadmin.properties.js", "text/javascript")]

Dnn.CommunityForums/ReleaseNotes.txt

+5-12
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<hr />
9090

9191
<h3>
92-
08.02.04
92+
08.02.05
9393
</h3>
9494
<p>
9595
<b>THANK YOU</b> for all of the valuable contributions by <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a><!--,
@@ -102,7 +102,8 @@
102102

103103
<h4>New Features &amp; Enhancements</h4>
104104
<ul>
105-
<li>None at this time.</li>
105+
<li>Improved User Experience When Placing the Module on a Page (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1305">Issue 1305</a>)</li>
106+
<li>Improved User Experience When Placing the Module on Blue Backgrounds (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1304">Issue 1304</a>)</li>
106107
<!--
107108
<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
108109
<li>None at this time.</li>
@@ -111,13 +112,7 @@
111112

112113
<h4>Bug Fixes</h4>
113114
<ul>
114-
<li>FIXED: Quick Replies Sending Notifications Before Going Through Moderation (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1289">Issue 1289</a>!)</li>
115-
<li>FIXED: Unable to Delete a Topic After Creating It (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1277">Issue 1277</a>!)</li>
116-
<li>FIXED: `MODEDITEDATE` Token Incorrectly Being Updated on Every Refresh (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1282">Issue 1282</a>!)</li>
117-
<li>FIXED: &quot;Forums not available&quot; Exception in Topics View (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1273">Issue 1273</a>!)</li>
118-
<li>FIXED: User Accounts Without a `UserPortals` Record Throws Exceptions (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1283">Issue 1283</a>!)</li>
119-
<li>FIXED: Moderation HTML Output Issues (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1288">Issue 1288</a>!)</li>
120-
<li>FIXED: No Longer Getting Current User Accounts from `HttpContext` (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1290">Issue 1290</a>)</li>
115+
<li>FIXED: Topics Not Showing to Anonymous Visitors (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1301">Issue 1301</a>!)</li>
121116
<!--
122117
<li>FIXED: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>!)</li>
123118
<li>None at this time.</li>
@@ -126,9 +121,7 @@
126121

127122
<h4>Tasks / Development Updates (and Technical Debt)</h4>
128123
<ul>
129-
<li>TASK: Replaced Obsolete DNN API Methods (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1294">Issue 1294</a>)</li>
130-
<li>TASK: Updates to Unit Test Project to Better Integrate and Mock DNN objects (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1275">Issue 1275</a>)</li>
131-
<li>TASK: 8.2.4 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1296">Issue 1296</a>)</li>
124+
<li>Release Prep: 08.02.05 (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1313">Issue 1313</a>)</li>
132125
<!--
133126
<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
134127
<li>None at this time.</li>
+13-42
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,25 @@
11
<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="_default.ascx.cs" Inherits="DotNetNuke.Modules.ActiveForums._default" %>
2-
<div style="margin-left: auto; margin-right: auto; width: 460px; height: auto; text-align: left; padding: 20px 0px; font-family: Helvetica Neue, Helvetica, Arial, sans-serif; font-size: 14px; color: rgba(0, 0, 0, 0.44); border: 0 none; line-height: 1.5;">
2+
<div class="dcf-init-screen">
33

4-
<div style="margin-left: auto; margin-right: auto; max-width: 130px; height: 100%; text-align: left; margin-bottom: 20px; margin-top: 2px; float: left; margin-right: 20px;">
5-
<img runat="server" src="~/DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Logo-Horizontal.png" alt="DNN Community Forums" />
4+
<div class="dcf-init-logo-wrap">
5+
<img class="dcf-init-logo" runat="server" src="~/DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Logo-Horizontal.png" alt="DNN Community Forums" />
66
</div>
77

8-
<p style="font-weight: 300; font-size: 22px; letter-spacing: -0.02em; color: rgba(0, 0, 0, 0.6);">
9-
Thank you for choosing DNN Community Forums as your method of easily building a complete online community.
10-
</p>
11-
<p style="border-top: 1px solid rgba(0, 0, 0, 0.1); padding-top: 15px;">DNN Community Forums allows you to quickly setup a feature-rich discussion forum for your website.</p>
8+
<h2 class="dcf-init-title-main">
9+
Thank you for choosing DNN Community Forums.<br>
10+
Your method of easily building a complete online community.
11+
</h2>
12+
13+
<p>DNN Community Forums allows you to quickly setup a feature-rich discussion forum for your website.</p>
1214
<p>
1315
Whether you are a hobbyist who just needs a single forum or you are building an on-line community for your enterprise, DNN
1416
Community Forums is the leading solution. As you will soon see, no other forum package for DNN has as many features or the flexibility of DNN Community Forums.
1517
</p>
1618
<p>
1719
Click the continue button to get started.<br />
1820

19-
<style>
20-
.afcontinue {
21-
text-decoration: none;
22-
-webkit-border-radius: 2px;
23-
-moz-border-radius: 2px;
24-
border-radius: 2px;
25-
-webkit-user-select: none;
26-
-moz-user-select: none;
27-
-ms-user-select: none;
28-
user-select: none;
29-
-webkit-box-sizing: border-box;
30-
-moz-box-sizing: border-box;
31-
-ms-box-sizing: border-box;
32-
-o-box-sizing: border-box;
33-
box-sizing: border-box;
34-
display: inline-block;
35-
float: right;
36-
font-weight: 500;
37-
outline: 0;
38-
padding: 3px 7px 4px 7px;
39-
text-align: center;
40-
text-decoration: none;
41-
text-shadow: none;
42-
cursor: pointer;
43-
box-shadow: 0 1px 2px rgba(0,0,0,0.15);
44-
border: 1px solid #46292b;
45-
background: #dfe7ff;
46-
color: #0162dea3;
47-
line-height: 1.5;
48-
margin-top: 20px;
49-
margin-bottom: 15px;
50-
}
51-
</style>
52-
<asp:Button ID="btnContinue" runat="server" CssClass="afcontinue" Text="Continue" />
21+
<div class="dcf-buttons">
22+
<asp:Button ID="btnContinue" runat="server" CssClass="dnnPrimaryAction" Text="Continue" />
23+
</div>
5324
</p>
54-
</div>
25+
</div>
Loading

Dnn.CommunityForums/module.css

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
------------ */
1111

1212

13+
/* Module Init screen */
14+
.dcf-init-screen img{
15+
max-width: 300px;
16+
}
17+
1318
/* #1 New wrapper class */
1419
.dnn-community-forums input[type=checkbox],
1520
.dnn-community-forums input[type=radio] {

0 commit comments

Comments
 (0)