From 1d9580a378f561aa39605ee6902ffec7a1e91216 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoeflingsoftware.com>
Date: Mon, 9 Jul 2018 15:07:15 -0400
Subject: [PATCH] Added new CSS Styles Wiki Configuration option; Added Table
 Styles option which allows us to specify custom css classes to be injected
 for each table element that is created.

---
 BusinessObjects/Models/Setting.cs             |   6 +++++
 DotNetNuke.Wiki.csproj                        |   1 +
 .../SqlDataProvider/05.00.07.SqlDataProvider  | Bin 0 -> 198 bytes
 Resources/Wiki.dnn                            |   7 ++++-
 Utilities/WikiModuleBase.cs                   |  25 ++++++++++++++++--
 Views/Administration.ascx                     |  11 ++++++++
 Views/Administration.ascx.cs                  |   2 ++
 Views/Administration.ascx.designer.cs         |  18 +++++++++++++
 .../Administration.ascx.resx                  |   9 +++++++
 9 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 Resources/SqlDataProvider/05.00.07.SqlDataProvider

diff --git a/BusinessObjects/Models/Setting.cs b/BusinessObjects/Models/Setting.cs
index b3b2736..7a4d7dc 100644
--- a/BusinessObjects/Models/Setting.cs
+++ b/BusinessObjects/Models/Setting.cs
@@ -128,6 +128,12 @@ public string CommentNotifyRoles
         /// <value>The comment notify users.</value>
         public bool? CommentNotifyUsers { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Table Styles.
+        /// </summary>
+        /// <value>The custom css classes to apply to any Table that is generated by the module.</value>
+        public string TableStyles { get; set; }
+
         #endregion "Properties"
     }
 }
\ No newline at end of file
diff --git a/DotNetNuke.Wiki.csproj b/DotNetNuke.Wiki.csproj
index c2cfea0..fa457c4 100644
--- a/DotNetNuke.Wiki.csproj
+++ b/DotNetNuke.Wiki.csproj
@@ -315,6 +315,7 @@
   <ItemGroup>
     <None Include="packages.config" />
     <Content Include="web.config" />
+    <Content Include="Resources\SqlDataProvider\05.00.07.SqlDataProvider" />
     <None Include="web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
diff --git a/Resources/SqlDataProvider/05.00.07.SqlDataProvider b/Resources/SqlDataProvider/05.00.07.SqlDataProvider
new file mode 100644
index 0000000000000000000000000000000000000000..cb540d9a9db0319d4f0e1378665179471f594c80
GIT binary patch
literal 198
zcmXAj%MQT+5Jk_H#6NV&&c+8+G&T*P#8SMKrjjZm;@5FnncU3d-nld1Pe{y+h$(?N
zq;DTtzu2;(6l-y1$CwAXx!^5(aelJfsF`q6laaC)f5pP;ES4lrN+Wgqpi|(LfzhH#
l!<*HGOiiNZSyz=N=Ppy|f2?zx9$lj&H)8IWaqTeluOAQvBZB|{

literal 0
HcmV?d00001

diff --git a/Resources/Wiki.dnn b/Resources/Wiki.dnn
index e0b7622..c2203f5 100644
--- a/Resources/Wiki.dnn
+++ b/Resources/Wiki.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Wiki" type="Module" version="05.00.01">
+    <package name="DotNetNuke.Wiki" type="Module" version="05.00.07">
       <friendlyName>Wiki</friendlyName>
       <description>The DotNetNuke Wiki module, more information available at www.dnnsoftware.com</description>
       <owner>
@@ -68,6 +68,11 @@
               <name>04.05.03.SqlDataProvider</name>
               <version>04.05.03</version>
             </script>
+            <script type="Install">
+              <path>Resources\SqlDataProvider</path>
+              <name>05.00.07.SqlDataProvider</name>
+              <version>05.00.07</version>
+            </script>
             <script type="UnInstall">
               <path>Resources\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
diff --git a/Utilities/WikiModuleBase.cs b/Utilities/WikiModuleBase.cs
index e6cdf12..5d10a25 100644
--- a/Utilities/WikiModuleBase.cs
+++ b/Utilities/WikiModuleBase.cs
@@ -557,7 +557,18 @@ protected IEnumerable<Topic> Search(string searchString)
         /// <returns>html for the topics</returns>
         protected string CreateTable(List<Topic> topicCollection)
         {
-            System.Text.StringBuilder tableHTML = new System.Text.StringBuilder("<table><tr><th>");
+            System.Text.StringBuilder tableHTML = new System.Text.StringBuilder();
+
+            if (string.IsNullOrEmpty(WikiSettings.TableStyles))
+            {
+                tableHTML.Append("<table>");
+            }
+            else
+            {
+                tableHTML.Append($"<table class=\"{WikiSettings.TableStyles}\">");
+            }
+
+            tableHTML.Append("<tr><th>");
             tableHTML.Append(Localization.GetString("BaseCreateTableTopic", this.RouterResourceFile));
             tableHTML.Append("</th><th>");
             tableHTML.Append(Localization.GetString("BaseCreateTableModBy", this.RouterResourceFile));
@@ -638,7 +649,17 @@ protected string CreateSearchTable(string searchString)
         protected string CreateHistoryTable()
         {
             System.Text.StringBuilder tableText = new System.Text.StringBuilder(1000);
-            tableText.Append("<table><tr><th>");
+
+            if (string.IsNullOrEmpty(WikiSettings.TableStyles))
+            {
+                tableText.Append("<table>");
+            }
+            else
+            {
+                tableText.Append($"<table class=\"{WikiSettings.TableStyles}\">");
+            }
+
+            tableText.Append("<tr><th>");
             tableText.Append(Localization.GetString("BaseCreateTableTopic", this.RouterResourceFile));
             tableText.Append("</th><th>");
             tableText.Append(Localization.GetString("BaseCreateTableTitle", this.RouterResourceFile));
diff --git a/Views/Administration.ascx b/Views/Administration.ascx
index 4359528..6ce36d8 100644
--- a/Views/Administration.ascx
+++ b/Views/Administration.ascx
@@ -82,6 +82,17 @@
             <asp:CheckBox ID="DefaultRatingMode" runat="server" Enabled="false" />
         </div>
     </fieldset>
+    <h2 id="dnnSitePanel-CssSettings" class="dnnFormSectionHead">
+        <a href="" class="dnnSectionExpanded">
+            <%=LocalizeString("CssSettings")%>
+        </a>
+    </h2>
+    <fieldset>
+        <div class="dnnFormItem">
+            <dnn:Label ID="lblTableStyles" runat="server" />
+            <asp:TextBox ID="TableStyles" AutoPostBack="true" runat="server" />
+        </div>
+    </fieldset>
 </div>
 <br />
 <asp:LinkButton ID="SaveButton" resourcekey="SaveButton" OnClick="SaveButton_Click" runat="server" CssClass="dnnPrimaryAction" />
diff --git a/Views/Administration.ascx.cs b/Views/Administration.ascx.cs
index 34bc369..1f62727 100644
--- a/Views/Administration.ascx.cs
+++ b/Views/Administration.ascx.cs
@@ -163,6 +163,7 @@ private void CtrlPage_Load(object sender, System.EventArgs e)
                         this.DefaultCommentsMode.Checked = this.mSettingsModel.DefaultDiscussionMode == true;
                         this.DefaultRatingMode.Checked = this.mSettingsModel.DefaultRatingMode == true;
                         this.NotifyMethodUserComments.Checked = this.mSettingsModel.CommentNotifyUsers == true;
+                        this.TableStyles.Text = this.mSettingsModel.TableStyles;
 
                         this.NotifyMethodCustomRoles.Checked =
                             !(!string.IsNullOrWhiteSpace(this.mSettingsModel.CommentNotifyRoles) &&
@@ -512,6 +513,7 @@ private void SaveSettings()
                 this.mSettingsModel.DefaultDiscussionMode = this.DefaultCommentsMode.Checked;
                 this.mSettingsModel.DefaultRatingMode = this.DefaultRatingMode.Checked;
                 this.mSettingsModel.CommentNotifyUsers = this.NotifyMethodUserComments.Checked;
+                this.mSettingsModel.TableStyles = this.TableStyles.Text;
 
                 if (this.mSettingsModel.ModuleId == -1)
                 {
diff --git a/Views/Administration.ascx.designer.cs b/Views/Administration.ascx.designer.cs
index c150151..008c03e 100644
--- a/Views/Administration.ascx.designer.cs
+++ b/Views/Administration.ascx.designer.cs
@@ -246,6 +246,24 @@ public partial class Administration {
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox DefaultRatingMode;
         
+        /// <summary>
+        /// lblTableStyles control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::DotNetNuke.UI.UserControls.LabelControl lblTableStyles;
+        
+        /// <summary>
+        /// TableStyles control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox TableStyles;
+        
         /// <summary>
         /// SaveButton control.
         /// </summary>
diff --git a/Views/App_LocalResources/Administration.ascx.resx b/Views/App_LocalResources/Administration.ascx.resx
index 831c5c2..a1aaa9f 100644
--- a/Views/App_LocalResources/Administration.ascx.resx
+++ b/Views/App_LocalResources/Administration.ascx.resx
@@ -219,4 +219,13 @@
   <data name="WikiSecurity.Text" xml:space="preserve">
     <value>Wiki Editor Roles</value>
   </data>
+  <data name="CssSettings.Text" xml:space="preserve">
+    <value>CSS Settings</value>
+  </data>
+  <data name="lblTableStyles.Help" xml:space="preserve">
+    <value>The custom CSS classes to be injected into each &amp;lt;table&amp;gt; HTML element</value>
+  </data>
+  <data name="lblTableStyles.Text" xml:space="preserve">
+    <value>Table Styles (CSS class)</value>
+  </data>
 </root>
\ No newline at end of file