Skip to content

Commit 1ebcff3

Browse files
rxturrxtur
committed
To set active theme from custom/themes rather than from settings
1 parent 51dcc28 commit 1ebcff3

File tree

9 files changed

+66
-31
lines changed

9 files changed

+66
-31
lines changed

‎BlogEngine/BlogEngine.NET/AppCode/Api/PackagesController.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public HttpResponseMessage Rate(string id, [FromBody]Review review)
111111

112112
if (review.Body.Length > 450) review.Body = review.Body.Substring(0, 450);
113113

114-
var result = BlogEngine.Core.Packaging.Gallery.RatePackage(id, review);
114+
var result = Gallery.RatePackage(id, review);
115115

116116
return Request.CreateResponse(HttpStatusCode.OK, result);
117117
}
@@ -131,4 +131,13 @@ public bool Refresh()
131131
}
132132
}
133133

134+
[HttpPut]
135+
public HttpResponseMessage SetTheme(string id)
136+
{
137+
if (!string.IsNullOrEmpty(id))
138+
{
139+
BlogEngine.Core.BlogSettings.Instance.Theme = id;
140+
}
141+
return Request.CreateResponse(HttpStatusCode.OK);
142+
}
134143
}

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@
4949
<SpecificVersion>False</SpecificVersion>
5050
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5151
</Reference>
52-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
52+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
54+
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="SimpleInjector, Version=3.0.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\SimpleInjector.3.0.4\lib\net45\SimpleInjector.dll</HintPath>
56+
<Reference Include="SimpleInjector, Version=3.0.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
57+
<HintPath>..\packages\SimpleInjector.3.0.5\lib\net45\SimpleInjector.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="SimpleInjector.Extensions.ExecutionContextScoping, Version=2.4.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\packages\SimpleInjector.Extensions.ExecutionContextScoping.3.0.4\lib\net45\SimpleInjector.Extensions.ExecutionContextScoping.dll</HintPath>
60+
<Reference Include="SimpleInjector.Extensions.ExecutionContextScoping, Version=3.0.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
61+
<HintPath>..\packages\SimpleInjector.Extensions.ExecutionContextScoping.3.0.5\lib\net45\SimpleInjector.Extensions.ExecutionContextScoping.dll</HintPath>
62+
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="SimpleInjector.Integration.WebApi, Version=3.0.4.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\SimpleInjector.Integration.WebApi.3.0.4\lib\net45\SimpleInjector.Integration.WebApi.dll</HintPath>
64+
<Reference Include="SimpleInjector.Integration.WebApi, Version=3.0.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
65+
<HintPath>..\packages\SimpleInjector.Integration.WebApi.3.0.5\lib\net45\SimpleInjector.Integration.WebApi.dll</HintPath>
66+
<Private>True</Private>
6767
</Reference>
6868
<Reference Include="System.Net" />
6969
<Reference Include="System.Net.Http" />

‎BlogEngine/BlogEngine.NET/Web.Config‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
<mimeMap fileExtension=".ico" mimeType="image/x-icon" />
221221
<remove fileExtension=".woff" />
222222
<mimeMap fileExtension=".woff" mimeType="font/x-woff" />
223+
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
223224
</staticContent>
224225
</system.webServer>
225226
<runtime>
@@ -238,12 +239,20 @@
238239
</dependentAssembly>
239240
<dependentAssembly>
240241
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
241-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
242+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
242243
</dependentAssembly>
243244
<dependentAssembly>
244245
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
245246
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
246247
</dependentAssembly>
248+
<dependentAssembly>
249+
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
250+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
251+
</dependentAssembly>
252+
<dependentAssembly>
253+
<assemblyIdentity name="SimpleInjector.Extensions.ExecutionContextScoping" publicKeyToken="984cb50dea722e99" culture="neutral" />
254+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
255+
</dependentAssembly>
247256
</assemblyBinding>
248257
</runtime>
249258
</configuration>

‎BlogEngine/BlogEngine.NET/admin/app/controllers/custom.js‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ angular.module('blogAdmin').controller('CustomController', ["$rootScope", "$scop
8686
});
8787
}
8888

89-
$scope.relocate = function (loc) {
90-
$scope.pkgLocation = loc;
91-
$("#fltr-loc").removeClass("active");
92-
$("#fltr-gal").removeClass("active");
93-
$scope.load();
94-
}
95-
9689
$scope.save = function () {
9790
$scope.spin = true;
9891

@@ -190,6 +183,22 @@ angular.module('blogAdmin').controller('CustomController', ["$rootScope", "$scop
190183
}
191184
}
192185

186+
$scope.setDefaultTheme = function (id) {
187+
$scope.spin = true;
188+
dataService.updateItem("/api/packages/settheme/" + id, id)
189+
.success(function (data) {
190+
ActiveTheme = id;
191+
$scope.activeTheme = id;
192+
toastr.success($rootScope.lbl.completed);
193+
$scope.load();
194+
$scope.spin = false;
195+
})
196+
.error(function () {
197+
toastr.error($rootScope.lbl.failed);
198+
$scope.spin = false;
199+
});
200+
}
201+
193202
$scope.load();
194203

195204
$(document).ready(function () {

‎BlogEngine/BlogEngine.NET/admin/app/grid-helpers.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@
106106
$("#fltr-pub").removeClass('active');
107107
$("#fltr-dft").removeClass('active');
108108

109-
$("#fltr-loc").removeClass("active");
110-
$("#fltr-gal").removeClass("active");
111-
112109
$("#fltr-" + fltr).addClass('active');
113110

114111
scope.filter = fltr;

‎BlogEngine/BlogEngine.NET/admin/views/custom/themes.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
2323
<img ng-if="item.IconUrl != ''" ng-src="{{item.IconUrl}}" />
2424
</a>
2525
</span>
26-
<div ng-class="(item.Id == activeTheme) ? 'info-box-content info-box-selected' : 'info-box-content'">
26+
<div id="pkg-{{item.Id}}" ng-class="(item.Id == activeTheme) ? 'info-box-content info-box-selected' : 'info-box-content'">
2727
<input type="checkbox" class="info-box-check pull-right" id="{{item.Id}}" data-ng-model="item.IsChecked" ng-disabled="item.Id === activeTheme.Theme || item.Id === activeTheme.Mobile || item.OnlineVersion === ''" />
2828
<span class="star-rating">
2929
<input disabled="disabled" type="radio" name="{{item.Id}}" value="1" ng-checked="checkStar(1, item.Rating)"><i></i>
@@ -39,6 +39,9 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
3939
<a ng-if="pkgLinkType(item.LocalVersion, item.OnlineVersion) === 'refresh'" title="Update package" href="" ng-click="installPackage(item.Id)"><i class="fa fa-refresh" style="color:red"></i></a>
4040
<span ng-if="pkgLinkType(item.LocalVersion, item.OnlineVersion) === 'installed'"><i class="fa fa-check" style="color:green"></i></span>
4141
</div>
42+
<div>
43+
<button ng-click="setDefaultTheme(item.Id)" ng-if="item.Id != activeTheme" class="btn btn-default btn-sm"><i class="fa fa-check"></i> {{lbl.setAsCurrentTheme}}</button>
44+
</div>
4245
</div>
4346
</div>
4447
</div>

‎BlogEngine/BlogEngine.NET/admin/views/settings/basic.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
3232
<select id="selZone" class="form-control" data-ng-options="o.OptionName for o in timeZoneOptions" data-ng-model="selTimeZone"></select>
3333
</div>
3434
</div>
35-
<div class="form-group">
35+
<!--<div class="form-group">
3636
<label class="control-label col-md-4" for="selDesktopTheme">{{lbl.setAsCurrentTheme}}</label>
3737
<div class="col col-md-6">
3838
<select id="selDesktopTheme" class="form-control" data-ng-options="o.OptionName for o in lookups.InstalledThemes" data-ng-model="selectedDeskTheme"></select>
@@ -43,7 +43,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
4343
<a class="btn btn-default" title="Find more" href="#/gallery"><i class="fa fa-download"></i>&nbsp;</a>
4444
</div>
4545
</div>
46-
</div>
46+
</div>-->
4747
<div class="form-group">
4848
<label class="control-label col-md-4"></label>
4949
<div class="col col-md-8">

‎BlogEngine/BlogEngine.NET/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
1919
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2020
<package id="Moment.js" version="2.10.6" targetFramework="net45" />
21-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
21+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
2222
<package id="OwlCarousel" version="1.3.3" targetFramework="net45" />
23-
<package id="SimpleInjector" version="3.0.4" targetFramework="net45" />
24-
<package id="SimpleInjector.Extensions.ExecutionContextScoping" version="3.0.4" targetFramework="net45" />
25-
<package id="SimpleInjector.Integration.WebApi" version="3.0.4" targetFramework="net45" />
23+
<package id="SimpleInjector" version="3.0.5" targetFramework="net45" />
24+
<package id="SimpleInjector.Extensions.ExecutionContextScoping" version="3.0.5" targetFramework="net45" />
25+
<package id="SimpleInjector.Integration.WebApi" version="3.0.5" targetFramework="net45" />
2626
<package id="toastr" version="2.1.1" targetFramework="net45" />
2727
<package id="Twitter.Bootstrap" version="3.0.1.1" targetFramework="net45" />
2828
<package id="WebGrease" version="1.6.0" targetFramework="net45" />

‎BlogEngine/BlogEngine.Tests/app.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@
1818
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
1919
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
2020
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="SimpleInjector.Extensions.ExecutionContextScoping" publicKeyToken="984cb50dea722e99" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
28+
</dependentAssembly>
2129
</assemblyBinding>
2230
</runtime>
2331
</configuration>

0 commit comments

Comments
 (0)