Skip to content

Commit 1ded960

Browse files
rxturrxtur
committed
Upgrade/delete features in custom themes and pluging pages
1 parent c797a2f commit 1ded960

File tree

5 files changed

+12
-19
lines changed

5 files changed

+12
-19
lines changed

‎BlogEngine/BlogEngine.NET/admin/app/custom/plugins/pluginController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
spinOn();
184184
dataService.updateItem("/api/packages/uninstall/" + pkgId, pkgId)
185185
.success(function (data) {
186-
$scope.installPackage();
186+
$scope.installPackage(pkgId);
187187
})
188188
.error(function () {
189189
toastr.error($rootScope.lbl.failed);

‎BlogEngine/BlogEngine.NET/admin/app/custom/plugins/pluginGallery.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ <h4 class="modal-title">{{package.Title}}</h4>
4747
<div class="page-header clearfix">
4848
<h2 class="page-title pull-left">{{lbl.gallery}}</h2>
4949
<button type="button" class="btn btn-default btn-sm btn-hasicon pull-left" onclick="window.history.back()"><i class="fa fa-angle-left"></i>Back</button>
50-
<button ng-click="processChecked('install')" ng-disabled="itemsChecked() === false" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-check"></i>{{lbl.install}}</button>
5150
<div class="search pull-right">
5251
<i class="fa fa-search"></i>
5352
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}..." />
@@ -66,7 +65,6 @@ <h2 class="page-title pull-left">{{lbl.gallery}}</h2>
6665
<div data-ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder:reverse" class="col-xs-6 col-md-6 col-lg-4">
6766
<div class="gallery-item">
6867
<div class="item-details-left">
69-
<input class="item-checkbox" type="checkbox" id="{{item.Id}}" data-ng-model="item.IsChecked" ng-disabled="items.length == 0" />
7068
<div class="item-img-box">
7169
<span>
7270
<img ng-if="item.IconUrl === ''" src="../Content/images/blog/pkg.png" />

‎BlogEngine/BlogEngine.NET/admin/app/custom/plugins/pluginView.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ <h4 class="modal-title">{{package.Title}}</h4>
2828
</div>
2929
</div>
3030
</div>
31-
<div class="item-alert">
31+
<div ng-if="package.OnlineVersion.length > 0 && package.OnlineVersion > package.LocalVersion" class="item-alert">
3232
<div class="alert alert-warning">
3333
Update available for this theme.
34-
<button class="btn btn-sm btn-warning pull-right">Update</button>
34+
<button ng-click="upgradePackage(package.Id)" class="btn btn-sm btn-warning pull-right">Update</button>
3535
</div>
3636
</div>
3737
<div class="modal-plugin-review" ng-if="package.Extra != null">
@@ -58,9 +58,9 @@ <h4 class="modal-title">{{package.Title}}</h4>
5858
</div>
5959
</div>
6060
</div>
61-
<div class="panel panel-default" ng-if="package.Extra.Reviews != null">
61+
<div class="panel panel-default" ng-if="package.Extra.Reviews != null && package.Extra.Reviews.length > 0">
6262
<div class="panel-heading">
63-
<div class="panel-title">user</div>
63+
<div class="panel-title">Reviews</div>
6464
</div>
6565
<ul class="list-group">
6666
<li ng-repeat="review in package.Extra.Reviews" class="list-group-item">
@@ -82,7 +82,7 @@ <h4 class="modal-title">{{package.Title}}</h4>
8282
<h4 class="modal-title">{{package.Title}}</h4>
8383
</div>
8484
<div class="modal-body">
85-
<iframe id="settingsFrame" class="iframe-package" onload="setIframeBg();" ng-src="{{extEditSrc}}"></iframe>
85+
<iframe id="settingsFrame" class="iframe-package" ng-src="{{extEditSrc}}"></iframe>
8686
</div>
8787
</div>
8888
</div>
@@ -116,7 +116,7 @@ <h2 class="page-title pull-left">Plugins</h2>
116116
<tbody>
117117
<tr data-ng-repeat="item in pagedItems[currentPage]">
118118
<td class="item-checkbox"><input ng-if="IsPrimary" type="checkbox" id="{{item.Id}}" data-ng-model="item.IsChecked" /></td>
119-
<td class="item-title"><a title="{{item.Title}}" href="" ng-click="showPluginInfo(item.Id)"> {{item.Title}} <span class="notify-icon"><i class="fa fa-info-circle notify"></i></span> </a></td>
119+
<td class="item-title"><a title="{{item.Title}}" href="" ng-click="showPluginInfo(item.Id)"> {{item.Title}} <span ng-if="item.OnlineVersion.length > 0 && item.OnlineVersion > item.LocalVersion" class="notify-icon"><i class="fa fa-info-circle notify"></i></span> </a></td>
120120
<td class="item-desc"><span class="text-ellipsis">{{item.Description}}</span></td>
121121
<td class="item-version"><span>{{item.LocalVersion}}</span></td>
122122
<td class="item-priority">{{item.Priority}}</td>

‎BlogEngine/BlogEngine.NET/admin/app/custom/themes/themeGallery.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ <h4 class="modal-title">{{package.Title}}</h4>
4141
<div class="page-header clearfix">
4242
<h2 class="page-title pull-left">{{lbl.gallery}}</h2>
4343
<button type="button" class="btn btn-default btn-sm btn-hasicon pull-left" onclick="window.history.back()"><i class="fa fa-angle-left"></i>Back</button>
44-
<button ng-click="processChecked('install')" ng-disabled="itemsChecked() === false" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-check"></i>{{lbl.install}}</button>
4544
<div class="search pull-right">
4645
<i class="fa fa-search"></i>
4746
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}..." />
@@ -60,7 +59,6 @@ <h2 class="page-title pull-left">{{lbl.gallery}}</h2>
6059
<div data-ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder:reverse" class="col-xs-6 col-md-6 col-lg-4">
6160
<div class="gallery-item">
6261
<div class="item-details-left">
63-
<input class="item-checkbox" type="checkbox" id="{{item.Id}}" data-ng-model="item.IsChecked" ng-disabled="items.length == 0" />
6462
<div class="item-img-box"><span><img ng-if="item.IconUrl === ''" src="../Content/images/blog/pkg.png" /> <img ng-if="item.IconUrl != ''" ng-src="{{item.IconUrl}}" /></span></div>
6563
<div class="item-buttons">
6664
<a ng-click="installPackage(item.Id)" class="btn btn-sm btn-default btn-left" angular-tooltip tooltip="lbl.download"><i class="fa fa-download"></i></a>

‎BlogEngine/BlogEngine.NET/admin/app/custom/themes/themeView.html

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ <h4 class="modal-title">{{package.Title}}</h4>
1717
<div class="form-group" ng-if="package.DownloadCount"><span class="col-md-3">{{lbl.downloads}}</span> <div class="col-md-9">{{package.DownloadCount}}</div> </div>
1818
</div>
1919
</div>
20-
<div class="item-alert">
20+
<div ng-if="package.OnlineVersion.length > 0 && package.OnlineVersion > package.LocalVersion" class="item-alert">
2121
<div class="alert alert-warning">
2222
Update available for this theme.
23-
<button class="btn btn-sm btn-warning pull-right">Update</button>
23+
<button ng-click="upgradePackage(package.Id)" class="btn btn-sm btn-warning pull-right">Update</button>
2424
</div>
2525
</div>
2626
<div class="modal-theme-image">
@@ -95,9 +95,6 @@ <h4 class="modal-title">{{lbl.customFields}}</h4>
9595
<div class="page-header clearfix">
9696
<h2 class="page-title pull-left">{{lbl.themes}}</h2>
9797
<a ng-if="IsPrimary" href="{{SiteVars.RelativeWebRoot}}admin/#/custom/themes/gallery" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
98-
<div ng-if="IsPrimary" class="btn-group befdv pull-left">
99-
<button ng-click="processChecked('uninstall')" ng-disabled="itemsChecked() === false" angular-tooltip tooltip="lbl.doDelete" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></button>
100-
</div>
10198
<div class="search pull-right">
10299
<i class="fa fa-search"></i>
103100
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}..." />
@@ -112,14 +109,14 @@ <h2 class="page-title pull-left">{{lbl.themes}}</h2>
112109
<img ng-if="item.IconUrl != ''" ng-src="{{item.IconUrl}}" />
113110
<i class="item-active fa fa-check" ng-if="item.Id === activeTheme"></i>
114111
</div>
115-
<input class="item-checkbox" ng-if="IsPrimary" type="checkbox" id="{{item.Id}}" data-ng-model="item.IsChecked" ng-disabled="item.Id === activeTheme.Theme || item.Id === activeTheme.Mobile || item.OnlineVersion === ''" />
116112
<div class="item-info clear">
117113
<div class="pull-left item-title">{{item.Title}}</div>
118114
<div class="item-buttons pull-right">
119115
<button ng-click="setDefaultTheme(item.Id)" ng-if="item.Id != activeTheme" class="btn btn-sm btn-hasicon btn-default"><i class="fa fa-check"></i> {{lbl.active}}</button>
120116
<button class="btn btn-sm btn-icon btn-default" ng-if="item.Id === activeTheme" ng-click="showSettings(item.Id)" angular-tooltip title="Customize"><i class="fa fa-sliders"></i></button>
121-
<button class="btn btn-sm btn-icon btn-default" angular-tooltip title="Delete"><i class="fa fa-trash"></i></button>
122-
<button class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle notify"></i> </button>
117+
<button ng-if="IsPrimary && item.OnlineVersion.length > 0 && item.Id != activeTheme" ng-click="uninstallPackage(item.Id)" class="btn btn-sm btn-icon btn-default" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></button>
118+
<button ng-if="item.OnlineVersion.length == 0 || item.OnlineVersion == item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle"></i> </button>
119+
<button ng-if="item.OnlineVersion.length > 0 && item.OnlineVersion > item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle notify"></i> </button>
123120
</div>
124121
</div>
125122
</div>

0 commit comments

Comments
 (0)