Added new widget zones for right section on blog pages

mgesing · mgesing · commit 45f86b8976ea · 2020-11-27T15:36:48.000+01:00
diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs
@@ -53,6 +53,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
                 "Product quantity is in range", 
                 "Produktmenge liegt in folgendem Bereich");
 
+            builder.AddOrUpdate("Newsletter.SubscriptionFailed",
+                "The subscription or unsubscription has failed.",
+                "Die Abonnierung bzw. Abbestellung ist fehlgeschlagen.");
+
             builder.AddOrUpdate("Common.UnsupportedBrowser",
                 "You are using an unsupported browser! Please consider switching to a modern browser such as Google Chrome, Firefox or Opera to fully enjoy your shopping experience.",
                 "Sie verwenden einen nicht unterstützten Browser! Bitte ziehen Sie in Betracht, zu einem modernen Browser wie Google Chrome, Firefox oder Opera zu wechseln, um Ihr Einkaufserlebnis in vollen Zügen genießen zu können.");
diff --git a/src/Presentation/SmartStore.Web/App_Data/widgetzones.json b/src/Presentation/SmartStore.Web/App_Data/widgetzones.json
@@ -41,7 +41,9 @@
 				"blogpost_page_after_comments",
 				"bloglist_page_before_posts",
 				"bloglist_page_inside_post",
-				"bloglist_page_after_posts"
+				"bloglist_page_after_posts",
+				"blog_right_months_after",
+				"blog_right_bottom"
 			]
 		},
 		{
diff --git a/src/Presentation/SmartStore.Web/Scripts/public.common.js b/src/Presentation/SmartStore.Web/Scripts/public.common.js
@@ -124,7 +124,10 @@
                             }
                         },
                         error: function (xhr, ajaxOptions, thrownError) {
-                            resultDisplay.empty().text("Failed to subscribe").removeClass("alert-success d-none").addClass("alert-danger d-block");
+                            resultDisplay.empty()
+                                .text(newsletterContainer.data('subscription-failure'))
+                                .removeClass("alert-success d-none")
+                                .addClass("alert-danger d-block");
                         }
                     });
                     return false;
diff --git a/src/Presentation/SmartStore.Web/Views/Blog/BlogPost.cshtml b/src/Presentation/SmartStore.Web/Views/Blog/BlogPost.cshtml
@@ -13,7 +13,9 @@
 @section right {
     @{
         Html.RenderAction("BlogMonths", "Blog");
+		Html.RenderWidget("blog_right_months_after");
         Html.RenderAction("BlogTags", "Blog");
+		Html.RenderWidget("blog_right_bottom");
     }
 }
 
diff --git a/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml b/src/Presentation/SmartStore.Web/Views/Blog/List.cshtml
@@ -14,11 +14,13 @@
 @section right {
     @{
         Html.RenderAction("BlogMonths", "Blog");
+        Html.RenderWidget("blog_right_months_after");
         Html.RenderAction("BlogTags", "Blog");
 
         <div class="d-none d-lg-block">
             @{ Html.RenderAction("PollBlock", "Poll", new { systemKeyword = "Blog" }); }
         </div>
+        Html.RenderWidget("blog_right_bottom");
     }
 }
 
diff --git a/src/Presentation/SmartStore.Web/Views/Common/Partials/Footer.cshtml b/src/Presentation/SmartStore.Web/Views/Common/Partials/Footer.cshtml
@@ -106,7 +106,7 @@
 				
 				@if (!Model.HideNewsletterBlock)
 				{
-					<div class="footer-newsletter nav-collapsible" data-subscription-url="@(Url.RouteUrl("SubscribeNewsletter"))">
+					<div class="footer-newsletter nav-collapsible" data-subscription-url="@(Url.RouteUrl("SubscribeNewsletter"))" data-subscription-failure="@T("Newsletter.SubscriptionFailed")">
 						<h4 class="footer-title nav-toggler collapsed" data-toggle="collapse" data-target="#footer-newsletter" aria-controls="footer-newsletter" aria-expanded="false">@T("Newsletter.Title")</h4>
 						<div class="collapse nav-collapse" id="footer-newsletter">
 							<div id="newsletter-subscribe-block">

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@`
`41`	`41`	`"blogpost_page_after_comments",`
`42`	`42`	`"bloglist_page_before_posts",`
`43`	`43`	`"bloglist_page_inside_post",`
`44`		`- "bloglist_page_after_posts"`
	`44`	`+ "bloglist_page_after_posts",`
	`45`	`+ "blog_right_months_after",`
	`46`	`+ "blog_right_bottom"`
`45`	`47`	`]`
`46`	`48`	`},`
`47`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,10 @@`
`124`	`124`	`}`
`125`	`125`	`},`
`126`	`126`	`error: function (xhr, ajaxOptions, thrownError) {`
`127`		`- resultDisplay.empty().text("Failed to subscribe").removeClass("alert-success d-none").addClass("alert-danger d-block");`
	`127`	`+ resultDisplay.empty()`
	`128`	`+ .text(newsletterContainer.data('subscription-failure'))`
	`129`	`+ .removeClass("alert-success d-none")`
	`130`	`+ .addClass("alert-danger d-block");`
`128`	`131`	`}`
`129`	`132`	`});`
`130`	`133`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@`
`13`	`13`	`@section right {`
`14`	`14`	`@{`
`15`	`15`	`Html.RenderAction("BlogMonths", "Blog");`
	`16`	`+ Html.RenderWidget("blog_right_months_after");`
`16`	`17`	`Html.RenderAction("BlogTags", "Blog");`
	`18`	`+ Html.RenderWidget("blog_right_bottom");`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,13 @@`
`14`	`14`	`@section right {`
`15`	`15`	`@{`
`16`	`16`	`Html.RenderAction("BlogMonths", "Blog");`
	`17`	`+ Html.RenderWidget("blog_right_months_after");`
`17`	`18`	`Html.RenderAction("BlogTags", "Blog");`
`18`	`19`
`19`	`20`	`<div class="d-none d-lg-block">`
`20`	`21`	`@{ Html.RenderAction("PollBlock", "Poll", new { systemKeyword = "Blog" }); }`
`21`	`22`	`</div>`
	`23`	`+ Html.RenderWidget("blog_right_bottom");`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@`
`106`	`106`
`107`	`107`	`@if (!Model.HideNewsletterBlock)`
`108`	`108`	`{`
`109`		`- <div class="footer-newsletter nav-collapsible" data-subscription-url="@(Url.RouteUrl("SubscribeNewsletter"))">`
	`109`	`+ <div class="footer-newsletter nav-collapsible" data-subscription-url="@(Url.RouteUrl("SubscribeNewsletter"))" data-subscription-failure="@T("Newsletter.SubscriptionFailed")">`
`110`	`110`	`<h4 class="footer-title nav-toggler collapsed" data-toggle="collapse" data-target="#footer-newsletter" aria-controls="footer-newsletter" aria-expanded="false">@T("Newsletter.Title")</h4>`
`111`	`111`	`<div class="collapse nav-collapse" id="footer-newsletter">`
`112`	`112`	`<div id="newsletter-subscribe-block">`