Skip to content

Commit 063c49d

Browse files
johnhenleyjohnhenley
committed
Merge branch 'dev'
2 parents 8675718 + d5a7c18 commit 063c49d

File tree

391 files changed

+6268
-9477
lines changed

Some content is hidden

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

391 files changed

+6268
-9477
lines changed

‎Dnn.CommunityForums/09.00.00.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
DesktopModules/ActiveForums/images/add_attach.png
2+
DesktopModules/ActiveForums/images/Cancel.gif
3+
DesktopModules/ActiveForums/images/closeX.png
4+
DesktopModules/ActiveForums/images/controlbar-black-border.gif
5+
DesktopModules/ActiveForums/images/controlbar-white-small.gif
6+
DesktopModules/ActiveForums/images/controlbar-white.gif
7+
DesktopModules/ActiveForums/images/controlbar2.gif
8+
DesktopModules/ActiveForums/images/controlbar3.gif
9+
DesktopModules/ActiveForums/images/controlbar4.gif
10+
DesktopModules/ActiveForums/images/controlbar4-hover.gif
11+
DesktopModules/ActiveForums/images/delete12.png
12+
DesktopModules/ActiveForums/images/fast_forward.png
13+
DesktopModules/ActiveForums/images/footerback.gif
14+
DesktopModules/ActiveForums/images/fullexpand.gif
15+
DesktopModules/ActiveForums/images/geckodimmer.png
16+
DesktopModules/ActiveForums/images/groups32.png
17+
DesktopModules/ActiveForums/images/icon.gif
18+
DesktopModules/ActiveForums/images/image_insert.png
19+
DesktopModules/ActiveForums/images/image_thumb.png
20+
DesktopModules/ActiveForums/images/loader.gif
21+
DesktopModules/ActiveForums/images/loader.white.gif
22+
DesktopModules/ActiveForums/images/mail.png
23+
DesktopModules/ActiveForums/images/mail_error.png
24+
DesktopModules/ActiveForums/images/mail_exchange.png
25+
DesktopModules/ActiveForums/images/mail_ok.png
26+
DesktopModules/ActiveForums/images/rewind.png
27+
DesktopModules/ActiveForums/images/settings32.png
28+
DesktopModules/ActiveForums/images/sp-actions16.png
29+
DesktopModules/ActiveForums/images/sp-status.png
30+
DesktopModules/ActiveForums/images/sp-tabs.png
31+
DesktopModules/ActiveForums/images/status0.png
32+
DesktopModules/ActiveForums/images/status1.png
33+
DesktopModules/ActiveForums/images/status3.png
34+
DesktopModules/ActiveForums/images/subnavback.gif
35+
DesktopModules/ActiveForums/images/zoomin.cur
36+
DesktopModules/ActiveForums/images/zoomout.cur

‎Dnn.CommunityForums/ActiveForumViewer.ascx.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,6 @@ protected override void OnLoad(EventArgs e)
5656
if (tmpForumTabId <= 0) { tmpForumTabId = this.TabId; }
5757
this.ctlForumLoader.ForumTabId = tmpForumTabId;
5858
this.ctlForumLoader.ModuleConfiguration = this.ModuleConfiguration;
59-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicsTemplate]) == null))
60-
{
61-
this.ctlForumLoader.DefaultTopicsViewTemplateId = Convert.ToInt32(this.Settings[ForumViewerSettingsKeys.AFTopicsTemplate]);
62-
}
63-
64-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFForumViewTemplate]) == null))
65-
{
66-
this.ctlForumLoader.DefaultForumViewTemplateId = Convert.ToInt32(this.Settings[ForumViewerSettingsKeys.AFForumViewTemplate]);
67-
}
68-
69-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicTemplate]) == null))
70-
{
71-
this.ctlForumLoader.DefaultTopicViewTemplateId = Convert.ToInt32(this.Settings[ForumViewerSettingsKeys.AFTopicTemplate]);
72-
}
73-
7459
System.Web.UI.HtmlControls.HtmlGenericControl oLink = new System.Web.UI.HtmlControls.HtmlGenericControl("link");
7560
oLink.Attributes["rel"] = "stylesheet";
7661
oLink.Attributes["type"] = "text/css";

‎Dnn.CommunityForums/ActiveForumViewer.ascx.designer.cs

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

‎Dnn.CommunityForums/ActiveForumViewerSettings.ascx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,4 @@
88
<td class="Normal">Select Forum:</td>
99
<td><asp:DropDownList id="drpForum" runat="server"></asp:DropDownList></td>
1010
</tr>
11-
<tr>
12-
<td class="Normal">Select Forum Group Template:</td>
13-
<td><asp:DropDownList id="drpForumViewTemplate" runat="server"></asp:DropDownList></td>
14-
</tr>
15-
<tr>
16-
<td class="Normal">Select Topics Template:</td>
17-
<td>
18-
<asp:DropDownList id="drpTopicsTemplate" runat="server"></asp:DropDownList></td>
19-
</tr>
20-
<tr>
21-
<td class="Normal">Select Topic Template:</td>
22-
<td>
23-
<asp:DropDownList id="drpTopicTemplate" runat="server"></asp:DropDownList></td>
24-
</tr>
2511
</table>

‎Dnn.CommunityForums/ActiveForumViewerSettings.ascx.cs

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ namespace DotNetNuke.Modules.ActiveForums
2222
{
2323
using System;
2424
using System.Linq;
25-
using System.Linq;
2625
using System.Web.UI.WebControls;
2726

2827
using DotNetNuke.Entities.Modules;
@@ -61,30 +60,11 @@ private void LoadSettings()
6160
this.LoadForumGroups(Convert.ToInt32(this.Settings[ForumViewerSettingsKeys.AFForumModuleId]));
6261
}
6362

64-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicsTemplate]) == null))
65-
{
66-
this.BindTemplates(Convert.ToInt32(this.Settings[ForumViewerSettingsKeys.AFForumModuleId]));
67-
this.drpTopicsTemplate.SelectedIndex = this.drpTopicsTemplate.Items.IndexOf(this.drpTopicsTemplate.Items.FindByValue(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicsTemplate])));
68-
}
69-
70-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFForumViewTemplate]) == null))
71-
{
72-
this.drpForumViewTemplate.SelectedIndex = this.drpForumViewTemplate.Items.IndexOf(this.drpForumViewTemplate.Items.FindByValue(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFForumViewTemplate])));
73-
}
74-
75-
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicTemplate]) == null))
76-
{
77-
this.drpTopicTemplate.SelectedIndex = this.drpTopicTemplate.Items.IndexOf(this.drpTopicTemplate.Items.FindByValue(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFTopicTemplate])));
78-
}
79-
8063
if (!(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFForumGroup]) == null))
8164
{
8265
this.drpForum.SelectedIndex = this.drpForum.Items.IndexOf(this.drpForum.Items.FindByValue(Convert.ToString(this.Settings[ForumViewerSettingsKeys.AFForumGroup])));
8366
}
8467

85-
// If Not CType(Settings["AFEnableToolbar"], String) Is Nothing Then
86-
// chkEnableToolbar.Checked = CType(Settings["AFEnableToolbar"], Boolean)
87-
// End If
8868
}
8969
}
9070
catch (Exception exc)
@@ -100,9 +80,6 @@ public override void UpdateSettings()
10080
var objModules = new DotNetNuke.Entities.Modules.ModuleController();
10181

10282
// Update ModuleSettings
103-
objModules.UpdateModuleSetting(this.ModuleId, ForumViewerSettingsKeys.AFTopicsTemplate, this.drpTopicsTemplate.SelectedItem.Value);
104-
objModules.UpdateModuleSetting(this.ModuleId, ForumViewerSettingsKeys.AFTopicTemplate, this.drpTopicTemplate.SelectedItem.Value);
105-
objModules.UpdateModuleSetting(this.ModuleId, ForumViewerSettingsKeys.AFForumViewTemplate, this.drpForumViewTemplate.SelectedItem.Value);
10683
objModules.UpdateModuleSetting(this.ModuleId, ForumViewerSettingsKeys.AFForumModuleId, this.drpForumInstance.SelectedItem.Value);
10784
objModules.UpdateModuleSetting(this.ModuleId, ForumViewerSettingsKeys.AFForumGroup, this.drpForum.SelectedItem.Value);
10885

@@ -162,7 +139,7 @@ public void LoadForums()
162139
public void LoadForumGroups(int forumModuleID)
163140
{
164141
this.drpForum.Items.Insert(0, new ListItem("-- Select a Group or Forum --", "-1"));
165-
var forums = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetForums(this.ModuleId).OrderBy(f => f.ForumGroup.SortOrder).ThenBy(f => f.SortOrder).ToList();
142+
var forums = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetForums(forumModuleID).OrderBy(f => f.ForumGroup.SortOrder).ThenBy(f => f.SortOrder).ToList();
166143

167144
int i = 1;
168145
string groupName = string.Empty;
@@ -185,28 +162,9 @@ public void LoadForumGroups(int forumModuleID)
185162
}
186163
}
187164

188-
private void BindTemplates(int forumModuleID)
189-
{
190-
string sDefault = Utilities.GetSharedResource("[RESX:Default]", true);
191-
this.BindTemplateDropDown(forumModuleID, this.drpTopicsTemplate, Templates.TemplateTypes.TopicsView, sDefault, "0");
192-
this.BindTemplateDropDown(forumModuleID, this.drpTopicTemplate, Templates.TemplateTypes.TopicView, sDefault, "0");
193-
this.BindTemplateDropDown(forumModuleID, this.drpForumViewTemplate, Templates.TemplateTypes.ForumView, sDefault, "0");
194-
}
195-
196165
private void drpForumInstance_SelectedIndexChanged(object sender, EventArgs e)
197166
{
198-
this.BindTemplates(Convert.ToInt32(this.drpForumInstance.SelectedItem.Value));
199167
this.LoadForumGroups(Convert.ToInt32(this.drpForumInstance.SelectedItem.Value));
200168
}
201-
202-
public void BindTemplateDropDown(int forumModuleId, DropDownList drp, Templates.TemplateTypes templateType, string defaultText, string defaultValue)
203-
{
204-
var tc = new TemplateController();
205-
drp.DataTextField = "Title";
206-
drp.DataValueField = "TemplateID";
207-
drp.DataSource = tc.Template_List(this.PortalId, forumModuleId, templateType);
208-
drp.DataBind();
209-
drp.Items.Insert(0, new ListItem(defaultText, defaultValue));
210-
}
211169
}
212170
}

‎Dnn.CommunityForums/ActiveForumViewerSettings.ascx.designer.cs

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

‎Dnn.CommunityForums/ActiveForums.ascx.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace DotNetNuke.Modules.ActiveForums
2323
using System;
2424
using System.Web.UI;
2525

26-
using DotNetNuke.Common.Utilities;
2726
using DotNetNuke.Entities.Modules;
2827
using DotNetNuke.Entities.Modules.Actions;
2928
using DotNetNuke.Modules.ActiveForums.Constants;

‎Dnn.CommunityForums/ActiveForums.ascx.designer.cs

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

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.fr-FR.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,4 +1483,13 @@ Votre méthode de suppression est actuellement définie sur {0}. Vos sujets ser
14831483
<data name="[RESX:Tips:EmailSubjectTemplate].Text" xml:space="preserve">
14841484
<value>Entrez le modèle à utiliser comme ligne d’objet lors de l’envoi de notifications. Le modèle peut inclure des jetons. Veuillez visiter le référentiel Github des forums de la communauté DNN (https://github.com/DNNCommunity/Dnn.CommunityForums) et consulter le wiki pour obtenir de la documentation sur les jetons.</value>
14851485
</data>
1486+
<data name="[RESX:Tips:AllowLikes].Text" xml:space="preserve">
1487+
<value>Permettez aux spectateurs d’aimer les publications et les réponses des sujets.</value>
1488+
</data>
1489+
<data name="[RESX:TemplateFileNameSuffix].Text" xml:space="preserve">
1490+
<value>Suffixe du nom de fichier du modèle</value>
1491+
</data>
1492+
<data name="[RESX:Tips:TemplateFileNameSuffix].Text" xml:space="preserve">
1493+
<value>Entrez une chaîne à utiliser lors de la récupération des modèles. Par exemple, si vous souhaitez disposer de fichiers de modèle distincts pour les forums modérés, entrez « modéré », puis les modèles seront récupérés à l’aide de « modéré » dans le nom de fichier, par exemple « TopicsView-moderated.ascx » plutôt que simplement « TopicsView.ascx » lorsque le modèle TopicsView est récupéré.</value>
1494+
</data>
14861495
</root>

‎Dnn.CommunityForums/App_LocalResources/ControlPanel.ascx.it-IT.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,4 +1480,13 @@ Il metodo di rimozione è attualmente impostato su {0}. I tuoi argomenti verran
14801480
<data name="[RESX:Tips:EmailSubjectTemplate].Text" xml:space="preserve">
14811481
<value>Inserisci il modello da utilizzare come oggetto per l'invio delle notifiche. Il modello può includere token. Visita il repository Github (https://github.com/DNNCommunity/Dnn.CommunityForums) dei forum della community DNN e consulta il wiki per la documentazione sui token.</value>
14821482
</data>
1483+
<data name="[RESX:Tips:AllowLikes].Text" xml:space="preserve">
1484+
<value>Consenti agli spettatori di mettere "mi piace" ai post e alle risposte degli argomenti.</value>
1485+
</data>
1486+
<data name="[RESX:TemplateFileNameSuffix].Text" xml:space="preserve">
1487+
<value>Suffisso del nome del file del modello</value>
1488+
</data>
1489+
<data name="[RESX:Tips:TemplateFileNameSuffix].Text" xml:space="preserve">
1490+
<value>Immettere una stringa da utilizzare per il recupero dei modelli. Ad esempio, se si desidera avere file modello separati per i forum moderati, immettere "moderato" e quindi i modelli verranno recuperati utilizzando "moderato" come parte del nome del file, ad esempio "TopicsView-moderated.ascx" anziché solo "TopicsView.ascx" quando viene recuperato il modello TopicsView.</value>
1491+
</data>
14831492
</root>

0 commit comments

Comments
 (0)