Skip to content

Commit fd4f7c3

Browse files
committed
Fixed links from dashboard to package detail page.
1 parent 7e3dc53 commit fd4f7c3

File tree

9 files changed

+20
-15
lines changed

9 files changed

+20
-15
lines changed

BlogEngine/BlogEngine.NET/Account/change-password-success.aspx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
<div id="ChangePwd" class="alert alert-success">
1111
<%=Resources.labels.passwordChangeSuccess %>
1212
</div>
13+
<br />
14+
<div class="btn-wrapper">
15+
<input type="button" class="btn btn-block btn-success" id="goHome" onclick="window.location.href='<%=BlogEngine.Core.Utils.RelativeWebRoot%>'" value="<%=Resources.labels.home %>" />
16+
</div>
1317
</div>
1418
</asp:Content>

BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ angular.module('blogAdmin').controller('BlogListController', ["$rootScope", "$sc
3535
angular.copy(data, $scope.items);
3636
gridInit($scope, $filter);
3737
callback;
38-
rowSpinOff($scope.items);
38+
spinOff();
3939
})
4040
.error(function () {
4141
toastr.error($rootScope.lbl.errorLoadingBlogs);

BlogEngine/BlogEngine.NET/admin/app/content/comments/commentFilters.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ angular.module('blogAdmin').controller('CommentFilterController', ["$rootScope",
1212
gridInit($scope, $filter);
1313
$('#txtFilter').val('');
1414
$('#txtFilter').focus();
15-
rowSpinOff($scope.items);
15+
spinOff();
1616
callback;
1717
})
1818
.error(function () {

BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardController.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,15 @@
167167
}
168168
});
169169
}
170+
$scope.getGalleryLink = function (tp, id) {
171+
var lk = "#/custom/themes/gallery";
172+
if(tp == "Extension"){
173+
lk = "#/custom/plugins/gallery";
174+
}
175+
$(".nav-primary > li").removeClass("active");
176+
$("#mu-custom").addClass("active");
177+
window.location.href = lk + "?pkgId=" + id;
178+
}
170179

171180
$scope.load();
172181

BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
133133
</div>
134134
<ul class="list-group">
135135
<li class="list-group-item clearfix" data-ng-repeat="pkg in packages">
136-
<a href="#/custom/package?id={{pkg.Id}}" class="item-link">
136+
<a href="" ng-click="getGalleryLink(pkg.PackageType, pkg.Id)" class="item-link">
137137
<img ng-if="pkg.IconUrl.length > 0" class="item-img" width="50" height="50" ng-src="{{pkg.IconUrl}}" />
138138
<img ng-if="pkg.IconUrl.length == 0" class="item-img" width="50" height="50" src="../Content/Images/blog/pkg.png" />
139139
<span class="item-title">{{pkg.Title}}</span>

BlogEngine/BlogEngine.NET/admin/app/editor/filemanagerController.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
angular.copy(data, $scope.items);
2020
gridInit($scope, $filter);
2121
$scope.currentPath = path ? path : $scope.rootStorage;
22-
rowSpinOff($scope.items);
22+
spinOff();
2323
})
2424
.error(function (data) {
2525
toastr.error($rootScope.lbl.Error);
@@ -145,13 +145,4 @@
145145
}
146146

147147
$scope.load('');
148-
149-
function rowSpinOff(items) {
150-
if (items.length > 0) {
151-
$('#tr-spinner').hide();
152-
}
153-
else {
154-
$('#div-spinner').html(BlogAdmin.i18n.empty);
155-
}
156-
}
157148
}]);

BlogEngine/BlogEngine.NET/admin/app/security/profile/profileView.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ <h2 class="page-title pull-left">
2727
{{lbl.myProfile}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
2828
</h2>
2929
<button data-ng-click="save()" class="btn btn-success btn-hasicon btn-sm btn-header pull-left" type="button"><i class="fa fa-check"></i>{{lbl.save}}</button>
30+
<a href="{{SiteVars.RelativeWebRoot}}Account/change-password.aspx" class="btn btn-default btn-sm btn-hasicon pull-left"><i class="fa fa-lock"></i>{{lbl.changePassword}}</a>
3031
</div>
3132
<div class="content-inner">
3233
<div id="frm-user-edit" class="form-width-limited">

BlogEngine/BlogEngine.NET/admin/app/settings/controls/blogrollController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ angular.module('blogAdmin').controller('BlogRollController', ["$rootScope", "$sc
5858
angular.copy(data, $scope.items);
5959
gridInit($scope, $filter);
6060
callback;
61-
rowSpinOff($scope.items);
61+
spinOff();
6262
})
6363
.error(function () {
6464
toastr.error($rootScope.lbl.errorLoadingBlogs);

BlogEngine/BlogEngine.NET/admin/app/settings/controls/pingController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ angular.module('blogAdmin').controller('PingSericesController', ["$rootScope", "
1616
angular.copy(data, $scope.items);
1717
gridInit($scope, $filter);
1818
callback;
19-
rowSpinOff($scope.items);
19+
spinOff();
2020
})
2121
.error(function () {
2222
toastr.error($rootScope.lbl.errorLoadingBlogs);

0 commit comments

Comments
 (0)