Skip to content

Commit 576b3be

Browse files
rxturrxtur
committed
Few improvements in admin to links, filters, sorting etc.
1 parent 0c8f258 commit 576b3be

7 files changed

Lines changed: 47 additions & 7 deletions

File tree

‎BlogEngine/BlogEngine.Core/Data/FileManagerRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public IEnumerable<FileInstance> Find(int take = 10, int skip = 0, string path =
3131
{
3232
FileSize = "",
3333
FileType = FileType.Directory,
34-
Created = "",
34+
Created = DateTime.Now.ToString(),
3535
FullPath = directory.Parent.FullPath,
3636
Name = "..."
3737
});

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
$scope.item = {};
44
$scope.id = ($location.search()).id;
55
$scope.filter = ($location.search()).fltr;
6+
$scope.sortingOrder = 'DateCreated';
7+
$scope.reverse = true;
68
$scope.commentsPage = true;
79

810
if ($scope.id) {
911
$("#modal-add-item").modal();
1012
}
1113

14+
$scope.showEditForm = function (id) {
15+
$("#modal-comment-edit").modal();
16+
$scope.id = id;
17+
$scope.focusInput = true;
18+
}
19+
1220
$scope.load = function () {
1321
var p = { type: 5, take: 0, skip: 0, filter: "", order: "" };
1422
dataService.getItems('/api/comments', p)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
$scope.data = dataService;
33
$scope.items = [];
44
$scope.itemsPerPage = 45; // page size - pass into grid on init
5+
$scope.sortingOrder = 'Created';
6+
$scope.reverse = true;
57
$scope.id = {};
68
$scope.file = {};
79
$scope.dirName = '';

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
angular.module('blogAdmin').controller('PostsController', ["$rootScope", "$scope", "$location", "$http", "$filter", "dataService", function ($rootScope, $scope, $location, $http, $filter, dataService) {
22
$scope.items = [];
33
$scope.filter = ($location.search()).fltr;
4+
$scope.sortingOrder = 'DateCreated';
5+
$scope.reverse = true;
46

57
$scope.load = function () {
68
var url = '/api/posts';

‎BlogEngine/BlogEngine.NET/admin/filemanager.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</div>
8787
</div>
8888
<div class="modal-footer">
89-
<button ng-click="createFolder()" class="btn btn-success pull-right btn-tabkey"><i class="fa fa-save"></i>{{lbl.save}}</button>
89+
<button type="button" ng-click="createFolder()" class="btn btn-success pull-right btn-tabkey"><i class="fa fa-save"></i>{{lbl.save}}</button>
9090
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
9191
</div>
9292
</div>
@@ -103,7 +103,7 @@
103103
</div>
104104
<div class="btn-group befdv pull-left">
105105
<button type="button" ng-click="addFolder()" class="btn btn-sm btn-warning" type="submit" title="Add folder"><i class="fa fa-folder"></i></button>
106-
<button ng-disabled="itemsChecked() === false" ng-click="processChecked('delete')" title="Delete" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i></button>
106+
<button type="button" ng-disabled="itemsChecked() === false" ng-click="processChecked('delete')" title="Delete" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i></button>
107107
</div>
108108
<div class="pull-left" style="margin-left: 5px">
109109
<input type="text" data-ng-model="query" data-ng-change="search()" class="input-sm form-control search-grid pull-right" placeholder="{{lbl.search}}" />

‎BlogEngine/BlogEngine.NET/admin/views/content/comments.html‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11
<div data-ng-controller="CommentListController">
2+
3+
<form id="cat-form" action="">
4+
<div id="modal-comment-edit" class="modal fade">
5+
<div class="modal-dialog">
6+
<div class="modal-content">
7+
<div class="modal-header">
8+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
9+
<h4 class="modal-title">{{id}}</h4>
10+
</div>
11+
<div class="modal-body">
12+
<div class="form-horizontal clearfix">
13+
<div class="form-group">
14+
<label class="control-label col-md-4" for="txtCatTitle">{{lbl.title}}</label>
15+
<div class="col col-md-8">
16+
<input type="text" class="form-control" id="txtCatTitle" name="txtCatTitle" data-ng-model="category.Title" focus-me="focusInput" />
17+
</div>
18+
</div>
19+
</div>
20+
</div>
21+
<div class="modal-footer">
22+
<button type="button" ng-click="saveCategory()" class="btn btn-success pull-right btn-tabkey"><i class="fa fa-save"></i>{{lbl.save}}</button>
23+
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
24+
</div>
25+
</div>
26+
</div>
27+
</div>
28+
</form>
29+
230
<div class="page-header clearfix">
331
<h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
432
{{lbl.comments}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
@@ -51,7 +79,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
5179
</td>
5280
<td class="item-avatar"><img ng-src="{{item.Avatar}}" alt="{{item.Author}}" title="{{item.Author}}" /></td>
5381
<td class="item-title">
54-
<a title="click to reply" target="_blank" href="{{item.RelativeLink}}"> {{item.Title}}</a>
82+
<a title="click to reply" ng-click="showEditForm(item.Id)" href=""> {{item.Title}}</a>
5583
<a title="click to view" class="external-link" target="_blank" href="{{item.RelativeLink}}"> <i class="fa fa-external-link"></i> </a>
5684
</td>
5785
<td class="item-date"><!--{{item.DateCreated}}-->2014/02/04</td>

‎BlogEngine/BlogEngine.NET/admin/views/content/posts.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ <h2 class="page-title pull-left">
5050
<td class="item-comments">
5151
<div ng-if="item.Comments">
5252
<span class="item-comment-count item-comment-approved" ng-if="item.Comments[1] != 0" title="{{lbl.approved}}: {{item.Comments[1]}}">
53-
<a href="{{item.RelativeLink}}#comment" target="_blank">{{item.Comments[1]}}</a>
53+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments?fltr=apr">{{item.Comments[1]}}</a>
5454
</span>
5555
<span class="item-comment-count item-comment-pending" ng-if="item.Comments[0] != 0" title="{{lbl.pending}}: {{item.Comments[0]}}">
56-
<a href="{{item.RelativeLink}}#comment" target="_blank">{{item.Comments[0]}}</a>
56+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments?fltr=pnd">{{item.Comments[0]}}</a>
5757
</span>
5858
<span class="item-comment-count item-comment-spam" ng-if="item.Comments[2] != 0" title="{{lbl.spam}}: {{item.Comments[2]}}">
59-
<a href="{{item.RelativeLink}}#comment" target="_blank">{{item.Comments[2]}}</a>
59+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments?fltr=spm">{{item.Comments[2]}}</a>
6060
</span>
6161
</div>
6262
</td>

0 commit comments

Comments
 (0)