Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lightbox gallery title bug #258

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Lightbox gallery title bug #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ee5b99
Update EditLightbox.ascx
alejoroman0605 Oct 31, 2024
667a665
Update ViewLightbox.ascx.vb
alejoroman0605 Oct 31, 2024
6cd1d6d
Update ViewLightbox.ascx.vb
alejoroman0605 Oct 31, 2024
ec095cd
Update WillStrohl.Modules.Lightbox.vbproj
alejoroman0605 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Modules/WillStrohl.LightboxGallery/EditLightbox.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
22 changes: 11 additions & 11 deletions Modules/WillStrohl.LightboxGallery/ViewLightbox.ascx.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion Modules/WillStrohl.LightboxGallery/WillStrohl.Modules.Lightbox.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down