Skip to content

Commit d1ee311

Browse files
iAlexeyProkhoroviAlexeyProkhorov
authored
Merge pull request #24 from iAlexeyProkhorov/nopCommerce_480_1
Update for nopCommerce 4.80.1
2 parents df702ef + 58f5a19 commit d1ee311

20 files changed

+226
-304
lines changed

‎Baroque.Plugin.Widgets.qBoSlider.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<TargetFramework>net8.0</TargetFramework>
11+
<TargetFramework>net9.0</TargetFramework>
1212
<Copyright>Copyright © Baroque Team</Copyright>
1313
<Company></Company>
1414
<Authors>Baroque Team</Authors>
1515
<PackageLicenseUrl></PackageLicenseUrl>
1616
<PackageProjectUrl></PackageProjectUrl>
1717
<RepositoryUrl>https://github.com/iAlexeyProkhorov/qBoSlider</RepositoryUrl>
1818
<RepositoryType>Git</RepositoryType>
19-
<Version>1.4.3</Version>
19+
<Version>1.4.6</Version>
2020
<OutputPath>..\..\Presentation\Nop.Web\Plugins\Widgets.qBoSlider</OutputPath>
2121
<OutDir>$(OutputPath)</OutDir>
2222
</PropertyGroup>
@@ -45,6 +45,7 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48+
<None Remove="Content\images\b14.png" />
4849
<None Remove="Scripts\jssor.js" />
4950
<None Remove="Scripts\jssor.slider.js" />
5051
<None Remove="Scripts\slideshow-transition-builder-controller.min.js" />
@@ -68,15 +69,9 @@
6869
<ProjectReference Include="..\..\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj" />
6970
</ItemGroup>
7071
<ItemGroup>
71-
<None Update="Content\images\a17.png">
72-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
73-
</None>
7472
<None Update="Content\images\ajax_loader.gif">
7573
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7674
</None>
77-
<None Update="Content\images\b14.png">
78-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
79-
</None>
8075
<None Update="Content\localization.en-US.xml">
8176
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8277
</None>

‎Components/PublicInfoComponent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ IWidgetZoneService widgetZoneService
5656

5757
public async Task<IViewComponentResult> InvokeAsync(string widgetZone, object additionalData)
5858
{
59-
var widget = _widgetZoneService.GetWidgetZoneBySystemName(widgetZone);
59+
var widget = await _widgetZoneService.GetWidgetZoneBySystemNameAsync(widgetZone);
6060

6161
//return empty result if widget zone has no slider
6262
if (widget == null)
@@ -75,7 +75,7 @@ public async Task<IViewComponentResult> InvokeAsync(string widgetZone, object ad
7575
return Content(string.Empty);
7676

7777
//return empty result, if widget zone has no published slides
78-
var slides = _widgetZoneService.GetWidgetZoneSlides(widget.Id);
78+
var slides = await _widgetZoneService.GetWidgetZoneSlidesAsync(widget.Id);
7979
if (!slides.Any())
8080
return Content(string.Empty);
8181

‎Content/images/a17.png‎

-5.38 KB
Binary file not shown.

‎Content/images/b14.png‎

-1.04 KB
Binary file not shown.

‎Content/slider.css‎

Lines changed: 77 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,125 @@
11
.slider-container {
2-
position: relative;
3-
top: 0px;
4-
left: 0px;
5-
width: 600px;
6-
height: 300px;
7-
overflow: hidden;
2+
position: relative;
3+
top: 0px;
4+
left: 0px;
5+
width: 600px;
6+
height: 300px;
7+
overflow: hidden;
88
}
99

10-
.slider-container #slider-loading {
11-
position: absolute;
12-
top: 0px;
13-
left: 0px;
14-
}
15-
16-
#slider-loading-background {
17-
filter: alpha(opacity=70);
18-
opacity: 0.7;
10+
.slider-container #slider-loading {
1911
position: absolute;
20-
display: block;
21-
background-color: #000000;
2212
top: 0px;
2313
left: 0px;
24-
width: 100%;
25-
height: 100%;
14+
}
15+
16+
#slider-loading-background {
17+
filter: alpha(opacity=70);
18+
opacity: 0.7;
19+
position: absolute;
20+
display: block;
21+
background-color: #000000;
22+
top: 0px;
23+
left: 0px;
24+
width: 100%;
25+
height: 100%;
2626
}
2727

2828
#slider-loading #loading {
29-
position: absolute;
30-
display: block;
31-
background: url(../Content/Images/ajax_loader.gif) no-repeat center center;
32-
top: 0px;
33-
left: 0px;
34-
width: 100%;
35-
height: 100%;
29+
position: absolute;
30+
display: block;
31+
background: url(../Content/Images/ajax_loader.gif) no-repeat center center;
32+
top: 0px;
33+
left: 0px;
34+
width: 100%;
35+
height: 100%;
3636
}
3737

3838
#slide-collection {
39-
cursor: pointer;
40-
position: absolute;
41-
left: 0px;
42-
top: 0px;
43-
width: 600px;
44-
height: 300px;
45-
overflow: hidden;
39+
cursor: pointer;
40+
position: absolute;
41+
left: 0px;
42+
top: 0px;
43+
width: 600px;
44+
height: 300px;
45+
overflow: hidden;
4646
}
4747

4848
.jssorb05 {
49-
position: absolute;
50-
transform: none !important;
49+
position: absolute;
50+
transform: none !important;
5151
}
5252

53-
.jssorb05 div, .jssorb05 div:hover, .jssorb05 .av {
54-
position: absolute;
55-
/* size of bullet elment */
56-
width: 20px;
57-
height: 20px;
58-
/*background: url(../Content/Images/b14.png) no-repeat;*/
59-
background:#4ab2f1;
60-
overflow: hidden;
61-
cursor: pointer;
62-
}
63-
64-
.jssorb05 div {
65-
background:#eaeaea;
66-
/*background-position: -7px -7px;*/
67-
}
53+
.jssorb05 div, .jssorb05 div:hover, .jssorb05 .av {
54+
position: absolute;
55+
/* size of bullet elment */
56+
width: 20px;
57+
height: 20px;
58+
background: #4ab2f1;
59+
overflow: hidden;
60+
cursor: pointer;
61+
}
6862

69-
.jssorb05 div:hover, .jssorb05 .av:hover {
70-
background-position: -37px -7px;
71-
}
63+
.jssorb05 div {
64+
background: #eaeaea;
65+
/*background-position: -7px -7px;*/
66+
}
7267

73-
.jssorb05 .av {
74-
background-position: -67px -7px;
68+
.jssorb05 div:hover, .jssorb05 .av:hover {
69+
background-position: -37px -7px;
7570
}
7671

77-
.jssorb05 .dn, .jssorb05 .dn:hover {
78-
background-position: -97px -7px;
79-
}
72+
.jssorb05 .av {
73+
background-position: -67px -7px;
74+
}
75+
76+
.jssorb05 .dn, .jssorb05 .dn:hover {
77+
background-position: -97px -7px;
78+
}
8079

8180
/*<!--#endregion Bullet Navigator Skin End -->
8281
<!--#region Arrow Navigator Skin Begin -->
8382
<!-- Help: http://www.jssor.com/development/slider-with-arrow-navigator-jquery.html -->*/
8483
.jssora12l, .jssora12r {
85-
display: block;
86-
position: absolute;
87-
/* size of arrow element */
88-
width: 45px;
89-
height: 46px;
90-
cursor: pointer;
91-
background: url(../Content/Images/a17.png) no-repeat;
92-
overflow: hidden;
84+
display: block;
85+
position: absolute;
86+
cursor: pointer;
87+
overflow: hidden;
9388
}
9489

9590
.jssora12l {
96-
background-position: -10px -37px;
97-
top: 123px;
98-
left: 10px;
91+
left: 10px;
92+
border-top: 15px solid transparent;
93+
border-bottom: 15px solid transparent;
94+
border-right: 15px solid #eaeaea;
9995
}
10096

10197
.jssora12r {
102-
background-position: -72px -37px;
103-
top: 123px;
104-
right: 10px;
98+
border-top: 15px solid transparent;
99+
border-bottom: 15px solid transparent;
100+
border-left: 15px solid #eaeaea;
101+
right: 10px;
105102
}
106103

107104
.jssora12l:hover {
108-
background-position: -130px -37px;
105+
border-right: 15px solid #4ab2f1;
109106
}
110107

111108
.jssora12r:hover {
112-
background-position: -191px -37px;
109+
border-left: 15px solid #4ab2f1;
113110
}
114111

115112
.jssora12l.jssora12ldn {
116-
background-position: -251px -37px;
113+
border-right: 15px solid #4ab2f1;
117114
}
118115

119116
.jssora12r.jssora12rdn {
120-
background-position: -311px -37px;
117+
121118
}
122119

123120
.slide-description {
124-
position: absolute;
125-
z-index: 1;
126-
width: 100%;
127-
height: 100%;
121+
position: absolute;
122+
z-index: 1;
123+
width: 100%;
124+
height: 100%;
128125
}

‎Controllers/qBoConfigurationController.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,9 @@ public qBoConfigurationController(ILocalizationService localizationService,
6363

6464
#region Methods
6565

66+
[CheckPermission(StandardPermission.Configuration.MANAGE_WIDGETS)]
6667
public virtual async Task<IActionResult> Configure()
6768
{
68-
if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
69-
return AccessDeniedView();
70-
7169
var storeScope = await _storeContext.GetActiveStoreScopeConfigurationAsync();
7270
var settings = await _settingService.LoadSettingAsync<qBoSliderSettings>(storeScope);
7371

@@ -81,11 +79,9 @@ public virtual async Task<IActionResult> Configure()
8179
}
8280

8381
[HttpPost]
82+
[CheckPermission(StandardPermission.Configuration.MANAGE_WIDGETS)]
8483
public virtual async Task<IActionResult> Configure(ConfigurationModel model)
8584
{
86-
if (!await _permissionService.AuthorizeAsync(StandardPermissionProvider.ManageWidgets))
87-
return AccessDeniedView();
88-
8985
var storeScope = await _storeContext.GetActiveStoreScopeConfigurationAsync();
9086
var settings = await _settingService.LoadSettingAsync<qBoSliderSettings>(storeScope);
9187

0 commit comments

Comments
 (0)