Update to 1.2.8.1

iAlexeyProkhorov · iAlexeyProkhorov · commit c967197f9c49 · 2021-02-11T00:11:13.000+02:00
Add 'Static cache attention message'. Update plugin localization resources for slide list page.
diff --git a/Content/localization.en-US.xml b/Content/localization.en-US.xml
@@ -1,7 +1,7 @@
 <Language Name="English">
 	<!--ADMIN-->
 	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.DontForgetToClearSiteCacheToSeeYourSliderChanges">
-		<Value>ATTENTION!!! Static cache was switched on. Clear nopCommerce cache to see slide changes.</Value>
+		<Value>ATTENTION! Static cache is switched on. Clear nopCommerce cache to see applied changes.</Value>
 	</LocaleResource>
 	<!--CONFIGURATION-->
 	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Configuration.UseStaticCache">
@@ -368,6 +368,18 @@
 	<LocaleResource Name="nop.plugin.baroque.widgets.qboslider.admin.slide.list.redirect">
 		<Value>Redirect</Value>
 	</LocaleResource>
+	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.Picture">
+		<Value>Picture</Value>
+	</LocaleResource>
+	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.StartDateUtc">
+		<Value>Start date</Value>
+	</LocaleResource>
+	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.EndDateUtc">
+		<Value>End date</Value>
+	</LocaleResource>
+	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.Published">
+		<Value>Published</Value>
+	</LocaleResource>
 	<!--ADMIN EDIT SLIDE WIDGET ZONE-->
 	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.EditSlideWidgetZonePopup">
 		<Value>Edit slide widget zone</Value>
diff --git a/Infrastructure/DependencyRegistrar.cs b/Infrastructure/DependencyRegistrar.cs
@@ -31,23 +31,6 @@ public class DependencyRegistrar : IDependencyRegistrar
 
         public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, NopConfig config)
         {
-            ////data context
-            //builder.RegisterPluginDataContext<qBoSliderContext>(ContextName);
-
-            ////repositories
-            //builder.RegisterType<EfRepository<WidgetZone>>()
-            //    .As<IRepository<WidgetZone>>()
-            //    .WithParameter(ResolvedParameter.ForNamed<IDbContext>(ContextName))
-            //    .InstancePerLifetimeScope();
-            //builder.RegisterType<EfRepository<Slide>>()
-            //    .As<IRepository<Slide>>()
-            //    .WithParameter(ResolvedParameter.ForNamed<IDbContext>(ContextName))
-            //    .InstancePerLifetimeScope();
-            //builder.RegisterType<EfRepository<WidgetZoneSlide>>()
-            //    .As<IRepository<WidgetZoneSlide>>()
-            //    .WithParameter(ResolvedParameter.ForNamed<IDbContext>(ContextName))
-            //    .InstancePerLifetimeScope();
-
             //associate services
             builder.RegisterType<SlideService>().As<ISlideService>().InstancePerLifetimeScope();
             builder.RegisterType<WidgetZoneService>().As<IWidgetZoneService>().InstancePerLifetimeScope();
diff --git a/Infrastructure/EfStartUpTask.cs b/Infrastructure/EfStartUpTask.cs
diff --git a/Infrastructure/RouteProvider.cs b/Infrastructure/RouteProvider.cs
diff --git a/Infrastructure/qBoSliderContext.cs b/Infrastructure/qBoSliderContext.cs
diff --git a/Nop.Plugin.Widgets.qBoSlider.csproj b/Nop.Plugin.Widgets.qBoSlider.csproj
@@ -149,6 +149,9 @@
     <None Update="Views\Admin\Slide\List.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Views\Admin\_qBoLayout.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Views\Admin\_WidgetZoneSearch.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/Views/Admin/Slide/Edit.cshtml b/Views/Admin/Slide/Edit.cshtml
@@ -5,7 +5,7 @@
     ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.Edit").Text;
     //active menu item (system name)
     Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-Slide");
-    Layout = "_AdminLayout";
+    Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";
 }
 
 <form asp-controller="qBoSlide" asp-action="Edit" method="post" id="slide-form">
diff --git a/Views/Admin/Slide/List.cshtml b/Views/Admin/Slide/List.cshtml
@@ -2,7 +2,7 @@
 @using Nop.Web.Framework.Models.DataTables
 
 @{
-    Layout = "_AdminLayout";
+    Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";
     ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List").Text;
 
     Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-Slide");
@@ -39,26 +39,26 @@
                                {
                                    new ColumnProperty(nameof(SlideSearchModel.SlideListItemModel.Picture))
                                    {
-                                       Title = T("Plugins.Widgets.qBoSlider.Picture").Text,
+                                       Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.Picture").Text,
                                        Width = "300",
                                        Visible = true,
                                        Render = new RenderPicture()
                                    },
                                    new ColumnProperty(nameof(SlideSearchModel.SlideListItemModel.StartDateUtc))
                                    {
-                                       Title = T("Plugins.Widgets.qBoSlider.CreateOrEdit.StartDateUtc").Text,
+                                       Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.StartDateUtc").Text,
                                        Width = "100",
                                        Render = new RenderDate()
                                    },
                                    new ColumnProperty(nameof(SlideSearchModel.SlideListItemModel.EndDateUtc))
                                    {
-                                       Title = T("Plugins.Widgets.qBoSlider.CreateOrEdit.EndDateUtc").Text,
+                                       Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.EndDateUtc").Text,
                                        Width = "100",
                                        Render = new RenderDate()
                                    },
                                    new ColumnProperty(nameof(SlideSearchModel.SlideListItemModel.Published))
                                    {
-                                       Title = T("Plugins.Widgets.qBoSlider.CreateOrEdit.Published").Text,
+                                       Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.List.Published").Text,
                                        ClassName = NopColumnClassDefaults.CenterAll,
                                        Width = "100",
                                        Render = new RenderBoolean()
diff --git a/Views/Admin/WidgetZone/Edit.cshtml b/Views/Admin/WidgetZone/Edit.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.WidgetZone.Edit").Text;
     //active menu item (system name)
     Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-WidgetZone");
-    Layout = "_AdminLayout";
+    Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";
 }
 
 <form asp-controller="qBoWidgetZone" asp-action="Edit" method="post" id="widget-zone-form">
diff --git a/Views/Admin/WidgetZone/List.cshtml b/Views/Admin/WidgetZone/List.cshtml
@@ -5,7 +5,7 @@
     ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.WidgetZone.List").Text;
     //active menu item (system name)
     Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-WidgetZone");
-    Layout = "_AdminLayout";
+    Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";
 }
 
 @{
diff --git a/Views/Admin/_qBoLayout.cshtml b/Views/Admin/_qBoLayout.cshtml
@@ -0,0 +1,21 @@
+﻿@using Nop.Plugin.Widgets.qBoSlider;
+@using Nop.Plugin.Widgets.qBoSlider.Models.Admin;
+
+@inject qBoSliderSettings settings;
+
+@{
+    Layout = "_AdminLayout";
+}
+
+
+@if (settings.UseStaticCache)
+{
+    <div class="content-header clearfix">
+        <div class="ui-state-highlight ui-corner-all" style="margin-top:0;padding:10px">
+            <span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em"></span>
+            @T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.DontForgetToClearSiteCacheToSeeYourSliderChanges")
+        </div>
+    </div>
+}
+
+@RenderBody()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Slide.Edit").Text;`
`6`	`6`	`//active menu item (system name)`
`7`	`7`	`Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-Slide");`
`8`		`- Layout = "_AdminLayout";`
	`8`	`+ Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`<form asp-controller="qBoSlide" asp-action="Edit" method="post" id="slide-form">`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`ViewBag.Title = T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.WidgetZone.Edit").Text;`
`5`	`5`	`//active menu item (system name)`
`6`	`6`	`Html.SetActiveMenuItemSystemName("Baroque-qBoSlider-WidgetZone");`
`7`		`- Layout = "_AdminLayout";`
	`7`	`+ Layout = "~/Plugins/Widgets.qBoSlider/Views/Admin/_qBoLayout.cshtml";`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`<form asp-controller="qBoWidgetZone" asp-action="Edit" method="post" id="widget-zone-form">`