Skip to content

Commit

Permalink
resync dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnhenley
johnhenley committed Apr 30, 2024
2 parents bf6c4f7 + acd2749 commit fff001f
Show file tree
Hide file tree
Showing 21 changed files with 226 additions and 159 deletions.
7 changes: 2 additions & 5 deletions Dnn.CommunityForums/CustomControls/UserControls/TopicView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -979,11 +979,8 @@ private string ParseControls(string sOutput)

sbOutput.Replace("[FORUMMAINLINK]", "<a href=\"" + NavigateUrl(TabId) + "\">[RESX:ForumMain]</a>");
sbOutput.Replace("[FORUMGROUPLINK]", "<a href=\"" + groupUrl + "\">" + _groupName + "</a>");
if (MainSettings.UseShortUrls)
sbOutput.Replace("[FORUMLINK]", "<a href=\"" + forumUrl + "\">" + _forumName + "</a>");
else
sbOutput.Replace("[FORUMLINK]", "<a href=\"" + forumUrl + "\">" + _forumName + "</a>");

sbOutput.Replace("[FORUMLINK]", "<a href=\"" + forumUrl + "\">" + _forumName + "</a>");

// Names and Ids
sbOutput.Replace("[FORUMID]", ForumId.ToString());
sbOutput.Replace("[FORUMNAME]", _forumName);
Expand Down
17 changes: 6 additions & 11 deletions Dnn.CommunityForums/controls/af_post.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,15 +666,12 @@ private void SaveTopic()
{
ti = new DotNetNuke.Modules.ActiveForums.Controllers.TopicController().GetById(TopicId);
authorId = ti.Author.AuthorId;
ti.Content.DateUpdated = DateTime.UtcNow;
}
else
{
ti = new DotNetNuke.Modules.ActiveForums.Entities.TopicInfo();
ti.Content = new DotNetNuke.Modules.ActiveForums.Entities.ContentInfo();
ti.ForumId = ForumInfo.ForumID;
ti.Content.DateCreated = DateTime.UtcNow;
ti.Content.DateUpdated = DateTime.UtcNow;
}

ti.AnnounceEnd = ctlForm.AnnounceEnd;
Expand Down Expand Up @@ -834,8 +831,6 @@ private void SaveTopic()

if (ti.IsApproved == false)
{
DotNetNuke.Modules.ActiveForums.Controllers.TopicController.QueueUnapprovedTopicAfterAction(PortalId, TabId, ForumModuleId, _fi.ForumGroupId, ForumId, TopicId, -1, ti.Content.AuthorId);

string[] @params = { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=confirmaction", ParamKeys.ConfirmActionId + "=" + ConfirmActions.MessagePending };
Response.Redirect(NavigateUrl(TabId, "", @params), false);
}
Expand Down Expand Up @@ -917,14 +912,11 @@ private void SaveReply()
if (PostId > 0)
{
ri = rc.GetById(PostId);
ri.Content.DateCreated = DateTime.UtcNow;
ri.Content.DateUpdated = DateTime.UtcNow;
}
else
{
ri = new DotNetNuke.Modules.ActiveForums.Entities.ReplyInfo();
ri.Content = new DotNetNuke.Modules.ActiveForums.Entities.ContentInfo();
ri.Content.DateUpdated = DateTime.UtcNow;
}

if (!_isEdit)
Expand Down Expand Up @@ -987,16 +979,19 @@ private void SaveReply()
}
if (!_isEdit)
{
DotNetNuke.Modules.ActiveForums.Controllers.ReplyController.QueueApprovedReplyAfterAction(PortalId, TabId, ModuleId, _fi.ForumGroupId, ForumId, TopicId, ReplyId, ri.Content.AuthorId);

var ctlUtils = new ControlUtils();
var fullURL = ctlUtils.BuildUrl(ForumTabId, ForumModuleId, ForumInfo.ForumGroup.PrefixURL, ForumInfo.PrefixURL, ForumInfo.ForumGroupId, ForumInfo.ForumID, TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, tmpReplyId, SocialGroupId);
var fullURL = ctlUtils.BuildUrl(TabId, ForumModuleId, ForumInfo.ForumGroup.PrefixURL, ForumInfo.PrefixURL, ForumInfo.ForumGroupId, ForumInfo.ForumID, TopicId, ri.Topic.TopicUrl, -1, -1, string.Empty, 1, tmpReplyId, SocialGroupId);

if (fullURL.Contains("~/"))
{
fullURL = Utilities.NavigateURL(TabId, "", new[] { ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + tmpReplyId });
}
if (fullURL.EndsWith("/"))
fullURL += "?" + ParamKeys.ContentJumpId + "=" + tmpReplyId;

{
fullURL += Utilities.UseFriendlyURLs(ForumModuleId) ? String.Concat("#", tmpReplyId) : String.Concat("?", ParamKeys.ContentJumpId, "=", tmpReplyId);
}
if (!_isEdit)

Response.Redirect(fullURL);
Expand Down
4 changes: 2 additions & 2 deletions Dnn.CommunityForums/sql/08.01.00.SqlDataProvider
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,7 @@ GO
/* create scheduler */
IF NOT EXISTS (Select * From {databaseOwner}{objectQualifier}Schedule WHERE TypeFullName = 'DotNetNuke.Modules.ActiveForums.Services.EmailNotificationQueue.Scheduler, DotNetNuke.Modules.ActiveForums')
INSERT INTO {databaseOwner}{objectQualifier}Schedule (TypeFullName,TimeLapse,TimeLapseMeasurement,RetryTimeLapse,RetryTimeLapseMeasurement,RetainHistoryNum,AttachToEvent,CatchUpEnabled,Enabled,ObjectDependencies,Servers,FriendlyName)
VALUES('DotNetNuke.Modules.ActiveForums.Services.EmailNotificationQueue.Scheduler, DotNetNuke.Modules.ActiveForums',1,'m',1,'m',100,'',0,1,'','','DNN Community Forums Email Notification Queue')
VALUES('DotNetNuke.Modules.ActiveForums.Services.EmailNotificationQueue.Scheduler, DotNetNuke.Modules.ActiveForums',1,'m',1,'m',100,'',1,1,'','','DNN Community Forums Email Notification Queue')
GO

/* issue 164 end - implement new mail queue */
Expand Down Expand Up @@ -1517,7 +1517,7 @@ GO

IF NOT EXISTS (Select * From {databaseOwner}{objectQualifier}Schedule WHERE TypeFullName = 'DotNetNuke.Modules.ActiveForums.Services.ProcessQueue.Scheduler, DotNetNuke.Modules.ActiveForums')
INSERT INTO {databaseOwner}{objectQualifier}Schedule (TypeFullName,TimeLapse,TimeLapseMeasurement,RetryTimeLapse,RetryTimeLapseMeasurement,RetainHistoryNum,AttachToEvent,CatchUpEnabled,Enabled,ObjectDependencies,FriendlyName,Servers)
VALUES('DotNetNuke.Modules.ActiveForums.Services.ProcessQueue.Scheduler, DotNetNuke.Modules.ActiveForums',1,'m',1,'m',100,'',0,1,'',N'DNN Community Forums Process Queue',NULL)
VALUES('DotNetNuke.Modules.ActiveForums.Services.ProcessQueue.Scheduler, DotNetNuke.Modules.ActiveForums',1,'m',1,'m',100,'',1,1,'',N'DNN Community Forums Process Queue',NULL)
GO


Expand Down
8 changes: 8 additions & 0 deletions Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_bootstrap.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Yes some of these could be done using Bootstrap classes, but are more efficient by overruling them

.table {
.dcf-th,
tbody+tbody {
border-width: 1px !important;
}
}
3 changes: 3 additions & 0 deletions Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_icons.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.dcf-icon-text{
white-space: nowrap;
}
8 changes: 8 additions & 0 deletions Dnn.CommunityForums/themes/community-bootstrap/_src/scss/theme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
@import "_variables.scss";


.dnn-community-forums{


@import "parts/_bootstrap.scss";
@import "parts/_action-bars.scss";
@import "parts/_edit.scss";
@import "parts/_icons.scss";
@import "parts/_toolbar.scss";
@import "parts/_topic-controls.scss";
@import "parts/_all.scss";
@import "parts/_breadcrumbs.scss";
@import "parts/_forum-view.scss";
@import "parts/_topics-view.scss";
@import "parts/_topic-view.scss";

}
20 changes: 13 additions & 7 deletions Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<table class="dcf-table dcf-table-100 table table-responsive-md">
<thead>
<tr class="dcf-table-head-row">
<th scope="col" colspan="2" class="dcf-th dcf-col-text">
<th scope="col" class="dcf-th dcf-col-text w-75">
<div class="dcf-th-text">[RESX:FORUMHEADER]</div>
</th>
<th scope="col" class="dcf-th dcf-col-topics">
Expand All @@ -27,20 +27,26 @@
<th scope="col" class="dcf-th dcf-col-subscribers">
<div class="dcf-icon-text"><i class="fa fa-envelope-o"></i><span class="dcf-link-text">[RESX:SUBSCRIBERS]</span></div>
</th>
<th scope="col" class="dcf-th dcf-col-last-post">
<th scope="col" class="dcf-th dcf-col-last-post w-25">
<div class="dcf-icon-text"><i class="fa fa-file-o"></i><span class="dcf-link-text">[RESX:LASTPOSTHEADER]</span></div>
</th>
</tr>
</thead>
[FORUMS]
<tbody>
<tr class="dcf-table-body-row">
<td class="dcf-col dcf-col-icon pr-0">[FORUMICONCSS]</td>
<td class="dcf-col dcf-col-text w-70">
<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
<span class="dcf-forum-description">[FORUMDESCRIPTION]</span>

<td class="dcf-col dcf-col-text border-0">
<div class="d-flex">
[FORUMICONCSS]
<div class="dcf-forum-title-text">
<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
<div class="dcf-forum-description">[FORUMDESCRIPTION]</div>
</div>
</div>

</td>
<td class="dcf-col dcf-col-topics">[TOTALTOPICS] </td>
<td class="dcf-col dcf-col-topics border-0">[TOTALTOPICS] </td>
<td class="dcf-col dcf-col-replies">[TOTALREPLIES]</td>
<td class="dcf-col dcf-col-subscribers">[FORUMSUBSCRIBERCOUNT]</td>
<td class="dcf-col dcf-col-last-post">
Expand Down
Binary file modified Dnn.CommunityForums/themes/community-bootstrap/theme-source.zip.resources
View file
Binary file not shown.
Loading

0 comments on commit fff001f

Please sign in to comment.