diff --git a/R7.News.Agent/ViewAgent.ascx b/R7.News.Agent/ViewAgent.ascx index c18985d..a0c7319 100644 --- a/R7.News.Agent/ViewAgent.ascx +++ b/R7.News.Agent/ViewAgent.ascx @@ -24,7 +24,7 @@ - + <%# HttpUtility.HtmlDecode (Item.TitleLink) %> @@ -54,6 +54,7 @@ ShowExpandTextAction="true" /> + diff --git a/R7.News.Stream/ViewNewsEntry.ascx b/R7.News.Stream/ViewNewsEntry.ascx index b5bd896..dd1b99d 100644 --- a/R7.News.Stream/ViewNewsEntry.ascx +++ b/R7.News.Stream/ViewNewsEntry.ascx @@ -6,11 +6,11 @@ <%@ Import Namespace="System.Web" %> - + - + <%# HttpUtility.HtmlDecode (Item.TitleLink) %> @@ -38,10 +38,8 @@ ShowExpandTextAction="false" /> - - - <%# HttpUtility.HtmlDecode (Item.Text) %> - + + <%# HttpUtility.HtmlDecode (Item.Text) %> diff --git a/R7.News.Stream/ViewStream.ascx b/R7.News.Stream/ViewStream.ascx index 0607285..54629d1 100644 --- a/R7.News.Stream/ViewStream.ascx +++ b/R7.News.Stream/ViewStream.ascx @@ -25,7 +25,7 @@ - + <%# HttpUtility.HtmlDecode (Item.TitleLink) %> @@ -54,6 +54,7 @@ ShowExpandTextAction="true" /> + diff --git a/R7.News/assets/js/news.js b/R7.News/assets/js/news.js index 1c13513..102d653 100644 --- a/R7.News/assets/js/news.js +++ b/R7.News/assets/js/news.js @@ -28,12 +28,12 @@ r7_news.expandText = function (btn, entryTextId, moduleId) { var service = new r7_news.service ($, moduleId); service.getNewsEntryText ( function (data) { - $(btn).parent().parent().prev().append(data.rawText); + $(btn).closest(".news-entry").find(".news-entry-expanded-text").append(data.rawText); $(btn).parent().hide(); }, function (xhr, status) { console.error ("R7.News: Error loading text!", xhr); - $(btn).parent().parent().prev().append('' + r7_news.resx ["errorLoadingExpandedText"] + ''); + $(btn).closest(".news-entry").find(".news-entry-expanded-text").append('' + r7_news.resx ["errorLoadingExpandedText"] + ''); $(btn).parent().hide(); }, { entryTextId: entryTextId }
@@ -54,6 +54,7 @@ ShowExpandTextAction="true" />
@@ -38,10 +38,8 @@ ShowExpandTextAction="false" />
' + r7_news.resx ["errorLoadingExpandedText"] + '