Merge pull request #260 from WillStrohl/development

Sync dev and main
WillStrohl · Oct 31, 2024 · 88f2d2a · 88f2d2a
2 parents 78d2640 + 42c0265
commit 88f2d2a
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 61 deletions.
diff --git a/Modules/WillStrohl.LightboxGallery/EditLightbox.ascx b/Modules/WillStrohl.LightboxGallery/EditLightbox.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="EditLightbox.ascx.vb" Inherits="WillStrohl.Modules.Lightbox.EditLightbox" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls" Assembly="DotNetNuke.Web.Deprecated" %>
 <%@ Import Namespace="DotNetNuke.Services.Localization" %>
 <div class="dnnClear">
     <asp:ValidationSummary ID="vsError" runat="server" CssClass="dnnFormMessage dnnFormValidationSummary" DisplayMode="List" ValidationGroup="lightbox" />

diff --git a/Modules/WillStrohl.LightboxGallery/My Project/AssemblyInfo.vb b/Modules/WillStrohl.LightboxGallery/My Project/AssemblyInfo.vb
@@ -30,7 +30,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("01.15.00")>
+<Assembly: AssemblyVersion("01.16.00")>
 
 <Assembly: ComVisibleAttribute(False)>
-<Assembly: AssemblyFileVersion("01.15.00")>
+<Assembly: AssemblyFileVersion("01.16.00")>
diff --git a/Modules/WillStrohl.LightboxGallery/ViewLightbox.ascx.vb b/Modules/WillStrohl.LightboxGallery/ViewLightbox.ascx.vb
@@ -50,8 +50,8 @@ Namespace WillStrohl.Modules.Lightbox
         Private Const ERROR_WRAP As String = "<span class=""NormalRed"">{0}</span>"
         Private Const EDIT_IMAGE_PATH As String = "/images/edit.gif"
         Private Const ORDER_IMAGE_PATH As String = "/images/copy.gif"
-        Private Const IMAGE_TEMPLATE As String = "<li class=""listitem""><span class=""wns_lightbox_span""><a data-fancybox=""gallery"" data-caption=""{4}"" class=""wns_lightbox_link"" rel=""{0}"" href=""{1}"" title=""{4}""><img src=""{2}"" alt=""{3}"" title=""{4}"" class=""wns_lightbox_image"" /></a></span></li> "
-        Private Const IMAGE_EDIT_TEMPLATE As String = "<li class=""listitem editview""><span class=""wns_lightbox_span""><a data-fancybox=""gallery"" data-caption=""{4}"" class=""wns_lightbox_link"" rel=""{0}"" href=""{1}"" title=""{4}""><img src=""{2}"" alt=""{3}"" title=""{4}"" class=""wns_lightbox_image"" /></a></span><span class=""wns_lightbox_image_edit_wrap""><a href=""{5}"" class=""wns_lightbox_image_edit"">{6}</a></span></li> "
+        Private Const IMAGE_TEMPLATE As String = "<li class=""listitem""><span class=""wns_lightbox_span""><a data-fancybox=""gallery"" data-caption=""{3}"" class=""wns_lightbox_link"" rel=""{0}"" href=""{1}"" title=""{3}""><img src=""{2}"" alt=""{3}"" title=""{3}"" class=""wns_lightbox_image"" /></a><p class=""image-description"">{4}</p></span></li>"
+        Private Const IMAGE_EDIT_TEMPLATE As String = "<li class=""listitem editview""><span class=""wns_lightbox_span""><a data-fancybox=""gallery"" data-caption=""{3}"" class=""wns_lightbox_link"" rel=""{0}"" href=""{1}"" title=""{3}""><img src=""{2}"" alt=""{3}"" title=""{3}"" class=""wns_lightbox_image"" /></a><p class=""image-description"">{4}</p></span><span class=""wns_lightbox_image_edit_wrap""><a href=""{5}"" class=""wns_lightbox_image_edit"">{6}</a></span></li>"
         Private Const MAX_IMAGE_HEIGHT As Integer = 100
 
         Private p_Albums As LightboxInfoCollection = Nothing
@@ -237,19 +237,19 @@ Namespace WillStrohl.Modules.Lightbox
                                 CleanNameForRel(GalleryName), _
                                 GetImageFileUrl(oImage), _
                                 GetImageFileUrl(oImageThumbnail), _
-                                objImage.Title, _
-                                objImage.Description, _
+                                If(oLightbox.HideTitleDescription, String.Empty, objImage.Title), _
+                                If(oLightbox.HideTitleDescription, String.Empty, objImage.Description), _
                                 GetImageEditUrl(objImage), _
                                 Me.GetLocalizedString("ImageEdit.Text") _
                             )
                         Else
-                            sb.AppendFormat( _
-                                IMAGE_TEMPLATE, _
-                                CleanNameForRel(GalleryName), _
-                                GetImageFileUrl(oImage), _
-                                GetImageFileUrl(oImageThumbnail), _
-                                objImage.Title, _
-                                objImage.Description _
+                            sb.AppendFormat(
+                                IMAGE_TEMPLATE,
+                                CleanNameForRel(GalleryName),
+                                GetImageFileUrl(oImage),
+                                GetImageFileUrl(oImageThumbnail),
+                                If(oLightbox.HideTitleDescription, String.Empty, objImage.Title),
+                                If(oLightbox.HideTitleDescription, String.Empty, objImage.Description)
                             )
                         End If
 

diff --git a/Modules/WillStrohl.LightboxGallery/WillStrohl.Lightbox.dnn b/Modules/WillStrohl.LightboxGallery/WillStrohl.Lightbox.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="WillStrohl.Lightbox" type="Module" version="01.15.00">
+    <package name="WillStrohl.Lightbox" type="Module" version="01.16.00">
       <friendlyName>Lightbox Gallery</friendlyName>
       <description>
         <![CDATA[<p>This is a lightbox gallery module, written by Will Strohl. Its original purpose was to highlight a few ways that jQuery can be integrated into DNN. It has since become one of the most popular ways to include image galleries into your DNN website.</p>]]>
@@ -16,7 +16,7 @@
       <releaseNotes src="releasenotes.txt" />
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="coreversion">09.10.00</dependency>
+        <dependency type="coreversion">09.11.00</dependency>
       </dependencies>
       <components>
         <component type="Script">
@@ -130,7 +130,7 @@
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>01.15.00</version>
+              <version>01.16.00</version>
             </script>
           </scripts>
         </component>
@@ -217,15 +217,15 @@
             <attributes>
               <businessControllerClass>WillStrohl.Modules.Lightbox.LightboxController, WillStrohl.Modules.Lightbox</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>01.13.00,01.14.00,01.15.00</upgradeVersionsList>
+              <upgradeVersionsList>01.13.00,01.14.00,01.15.00,01.16.00</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
         <component type="Assembly">
           <assemblies>
             <assembly>
               <name>WillStrohl.Modules.Lightbox.dll</name>
-              <version>01.15.00</version>
+              <version>01.16.00</version>
               <path>bin</path>
             </assembly>
             <assembly>

diff --git a/Modules/WillStrohl.LightboxGallery/WillStrohl.Lightbox_Symbols.dnn b/Modules/WillStrohl.LightboxGallery/WillStrohl.Lightbox_Symbols.dnn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="WillStrohl.Lightbox_Symbols" type="Library" version="01.15.00">
+    <package name="WillStrohl.Lightbox_Symbols" type="Library" version="01.16.00">
       <friendlyName>Lightbox Gallery Symbols</friendlyName>
       <description>
         <![CDATA[<p>This is a lightbox gallery module, written by Will Strohl. Its original purpose was to highlight a few ways that jQuery can be integrated into DNN. It has since become one of the most popular ways to include image galleries into your DNN website.</p>]]>
@@ -17,7 +17,7 @@
       <releaseNotes src="ReleaseNotes.txt" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="managedPackage" version="1.15.0">WillStrohl.Lightbox</dependency>
+        <dependency type="managedPackage" version="1.16.0">WillStrohl.Lightbox</dependency>
       </dependencies>
       <components>
         <component type="ResourceFile">

diff --git a/Modules/WillStrohl.LightboxGallery/WillStrohl.Modules.Lightbox.vbproj b/Modules/WillStrohl.LightboxGallery/WillStrohl.Modules.Lightbox.vbproj
@@ -315,7 +315,9 @@
     <Content Include="Module.css" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App_LocalResources\EditLightbox.ascx.resx" />
+    <Content Include="App_LocalResources\EditLightbox.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="App_LocalResources\ViewLightbox.ascx.resx" />
     <Content Include="ChangeOrder.ascx" />
     <Content Include="EditLightbox.ascx" />

diff --git a/Modules/WillStrohl.LightboxGallery/releasenotes.txt b/Modules/WillStrohl.LightboxGallery/releasenotes.txt
@@ -15,10 +15,10 @@
 		<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/UpendoVentures" target="_blank">Please consider contributing</a> any amount.</p>
 		<p>THANK YOU to the following rockstars!</p>
 		<ul>
-			<li>David Poindexter, <a href="https://nvisionative.com/" target="_blank">nvisionative</a></li>
-			<li>Dan Rice, <a href="https://www.puresystems.co.uk/" target="_blank">Pure Systems</a></li>
-			<li>Matt Rutledge, <a href="https://beleivekids.com/" target="_blank">Believe Kids</a></li>
 			<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
+			<li>Jeremy Farrance, <a href="https://accuraty.com/" target="_blank">Accuraty</a></li>
+			<li><a href="http://www.rammware.net/" target="_blank">John Ramminger</a></li>
+			<li><em>2 private sponsors</em></li>
 		</ul>
 
 		<h3>Contributors</h3>
@@ -35,6 +35,24 @@
 		</ul>
 		<hr />
 
+		<h3>Version 01.16.00</h3>
+		<h4>Enhancements</h4>
+		<ul>
+			<li>Updated to build against DNN Platform 9.11.0. (<a href="https://github.com/WillStrohl/dnnextensions/issues/249" target="_blank">Issue 249</a>, thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!)</li>
+			<!--
+			<li>SI:  (<a href="https://github.com/WillStrohl/dnnextensions/issues/" target="_blank">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>
+			-->
+		</ul>
+		<h4>Maintenence &amp Bug Fixes</h4>
+		<ul>
+			<li>Removed `DotNetNuke.Deprecated` from the DLL references. (No Issue) Thanks, <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
+			<li>Resolved bug preventing the setting from showing/hiding titles &amp; descriptions. (No Issue) Thanks, <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
+			<!--
+			<li> (<a href="https://github.com/WillStrohl/dnnextensions/issues/" target="_blank">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>
+			-->
+		</ul>
+		<hr />
+
 		<h3>Version 01.15.00</h3>
 		<h4>Enhancements</h4>
 		<ul>

diff --git a/Modules/WillStrohl.OpenGraph/releasenotes.txt b/Modules/WillStrohl.OpenGraph/releasenotes.txt
@@ -1,37 +1,37 @@
-<style>
-	div.uv-install-wrapper h3, div.uv-install-wrapper h4, div.uv-install-wrapper p, div.uv-install-wrapper hr, div.uv-install-wrapper ul { margin-bottom: 0.5em; }
-	div.uv-install-wrapper ul { padding-left: 2em; }
-	.muy-importante { color:red;font-weight:bold; }
-</style>
-<div class="uv-install-wrapper">
-	<h2>Open Graph Protocol Module</h2>
-	<h3>Version 02.01.00</h3>
-
-	<p class="muy-importante">The release notes continue after the Sponsors and Code Contributors below.</p>
-
-	<h3>Sponsors</h3>
-	<p>Open-source is not free. We're so GRATEFUL for the following people/organizations for <a href="https://github.com/sponsors/hismightiness" target="_blank">sponsoring developers</a> to work on this release!</p>
-	<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/hismightiness" target="_blank">Please consider sponsoring</a> any amount.</p>
-	<p>THANK YOU to the following rockstars!</p>
-	<ul>
-		<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
-		<li>Dan Rice, <a href="https://www.puresystems.co.uk/" target="_blank">Pure Systems</a></li>
-		<li>David Poindexter, <a href="https://nvisionative.com/" target="_blank">nvisionative</a></li>
-		<li>Matt Rutledge, <a href="https://beleivekids.com/" target="_blank">Believe Kids</a></li>
-	</ul>
-
-	<h3>Code Contributors</h3>
-	<p>THANK YOU to the following community members for participating in this release!</p>
-	<ul>
-		<li>Will Strohl, <a href="https://upendoventures.com/What/CMS/DNN" target="_blank">Upendo Ventures</a></li>
-		<li>Alejandro Roman, <a href="https://upendoventures.com/What/CMS/DNN/Extensions" target="_blank">Upendo Ventures</a></li>
-	</ul>
-
-	<p><strong>Date Released:</strong> 10/31/2024</p>
-	<ul>
-		<li>ENH: Increased minimum supported version of DNN to DNN Platform 09.11.00, Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
-		<li>ENH: Increased minimum supported version of NewtonSoft.Json to 13.00.03, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
-		<li>BUG: Caching error message always shows (<a href="https://github.com/hismightiness/dnnextensions/issues/31" target="_blank">Issue 31</a>), Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
-		<li>BUG: Updated `DotNetNuke.Web` reference to use Nuget instead of a local reference, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
-	</ul>
+<style>
+	div.uv-install-wrapper h3, div.uv-install-wrapper h4, div.uv-install-wrapper p, div.uv-install-wrapper hr, div.uv-install-wrapper ul { margin-bottom: 0.5em; }
+	div.uv-install-wrapper ul { padding-left: 2em; }
+	.muy-importante { color:red;font-weight:bold; }
+</style>
+<div class="uv-install-wrapper">
+	<h2>Open Graph Protocol Module</h2>
+	<h3>Version 02.01.00</h3>
+	
+	<p class="muy-importante">The release notes continue after the Sponsors and Code Contributors below.</p>
+	
+	<h3>Sponsors</h3>
+	<p>Open-source is not free. We're so GRATEFUL for the following people/organizations for <a href="https://github.com/sponsors/hismightiness" target="_blank">sponsoring developers</a> to work on this release!</p>
+	<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/hismightiness" target="_blank">Please consider sponsoring</a> any amount.</p>
+	<p>THANK YOU to the following rockstars!</p>
+	<ul>
+		<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
+		<li>Jeremy Farrance, <a href="https://accuraty.com/" target="_blank">Accuraty</a></li>
+		<li><a href="http://www.rammware.net/" target="_blank">John Ramminger</a></li>
+		<li><em>2 private sponsors</em></li>
+	</ul>
+	
+	<h3>Code Contributors</h3>
+	<p>THANK YOU to the following community members for participating in this release!</p>
+	<ul>
+		<li>Will Strohl, <a href="https://upendoventures.com/What/CMS/DNN" target="_blank">Upendo Ventures</a></li>
+		<li>Alejandro Roman, <a href="https://upendoventures.com/What/CMS/DNN/Extensions" target="_blank">Upendo Ventures</a></li>
+	</ul>
+
+	<p><strong>Date Released:</strong> 10/31/2024</p>
+	<ul>
+		<li>ENH: Increased minimum supported version of DNN to DNN Platform 09.11.00, Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
+		<li>ENH: Increased minimum supported version of NewtonSoft.Json to 13.00.03, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
+		<li>BUG: Caching error message always shows (<a href="https://github.com/hismightiness/dnnextensions/issues/31" target="_blank">Issue 31</a>), Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
+		<li>BUG: Updated `DotNetNuke.Web` reference to use Nuget instead of a local reference, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
+	</ul>
 </div>