Skip to content

Commit b4d2df2

Browse files
rxturrxtur
committed
Comment filters moved from settings to content, pager hide when only one page
1 parent 856438d commit b4d2df2

File tree

15 files changed

+170
-166
lines changed

15 files changed

+170
-166
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@
275275
<Content Include="admin\themes\standard\css\admin.css" />
276276
<Content Include="admin\views\content\blogs.html" />
277277
<Content Include="admin\views\about\index.html" />
278+
<Content Include="admin\views\content\filters.html" />
278279
<Content Include="admin\views\gallery\index.html" />
279280
<Content Include="admin\views\settings\controls.html" />
280281
<Content Include="admin\views\settings\controls\blogroll.html" />

‎BlogEngine/BlogEngine.NET/Custom/Themes/Standard/CommentForm.ascx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<%@ Control Language="C#" AutoEventWireup="true" EnableViewState="false" Inherits="BlogEngine.Core.Web.Controls.CommentFormBase" %>
22
<%@ Import Namespace="BlogEngine.Core" %>
3+
<style>
4+
textarea {
5+
height: 1em;
6+
transition: all 0.5s ease;
7+
}
8+
textarea:focus {
9+
height: 200px;
10+
}
11+
</style>
312
<div class="comment-form well-global">
413
<div class="well-global-title clearfix">
514
<h3 class="float-left" id="addcomment"><%=Resources.labels.addComment %></h3>
@@ -39,7 +48,7 @@
3948
<div class="form-group" id="commentCompose">
4049
<label for="txtContent" class="col-md-2 control-label"><%=Resources.labels.comment%> *</label>
4150
<div class="col-md-10">
42-
<textarea class="form-control" id="txtContent" cols="50" rows="6" name="txtContent"></textarea>
51+
<textarea class="form-control" id="txtContent" cols="50" rows="1" name="txtContent"></textarea>
4352
</div>
4453
</div>
4554
<% if(BlogSettings.Instance.ShowLivePreview){ %>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
.when("/content/pages", { templateUrl: "views/content/pages.html" })
1212
.when("/content/categories", { templateUrl: "views/content/categories.html" })
1313
.when("/content/tags", { templateUrl: "views/content/tags.html" })
14+
.when("/content/filters", { templateUrl: "views/content/filters.html" })
1415

1516
.when("/custom", { templateUrl: "views/custom/index.html" })
1617
.when("/custom/themes", { templateUrl: "views/custom/themes.html" })

‎BlogEngine/BlogEngine.NET/admin/themes/lte/sidebar.cshtml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<li data-ng-class="{ active: isActive('/content')}">
3131
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content"><i class="fa fa-circle-o"></i> <span>@Resources.labels.posts</span></a>
3232
</li>
33-
<li data-ng-class="{ active: isActive('/content/comments')}">
34-
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments"><i class="fa fa-circle-o"></i> <span>@Resources.labels.comments</span></a>
35-
</li>
33+
@if (BlogSettings.Instance.CommentProvider == BlogSettings.CommentsBy.BlogEngine)
34+
{
35+
<li data-ng-class="{ active: isActive('/content/comments')}">
36+
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments"><i class="fa fa-circle-o"></i> <span>@Resources.labels.comments</span></a>
37+
</li>
38+
}
3639
<li data-ng-class="{ active: isActive('/content/pages')}">
3740
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content/pages"><i class="fa fa-circle-o"></i> <span>@Resources.labels.pages</span></a>
3841
</li>

‎BlogEngine/BlogEngine.NET/admin/themes/standard/sidebar.cshtml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
<a href="{{SiteVars.RelativeWebRoot}}admin/#/content"><i class="fa fa-align-justify"></i>@Resources.labels.content</a>
1212
<ul>
1313
<li data-ng-class="{ active: isActive('/content')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content">@Resources.labels.posts</a></li>
14-
<li data-ng-class="{ active: isActive('/content/comments')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments">@Resources.labels.comments</a></li>
14+
@if (BlogSettings.Instance.CommentProvider == BlogSettings.CommentsBy.BlogEngine)
15+
{
16+
<li data-ng-class="{ active: isActive('/content/comments')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/comments">@Resources.labels.comments</a></li>
17+
}
1518
<li data-ng-class="{ active: isActive('/content/pages')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/pages">@Resources.labels.pages</a></li>
1619
<li data-ng-class="{ active: isActive('/content/categories')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/categories">@Resources.labels.categories</a></li>
1720
<li data-ng-class="{ active: isActive('/content/tags')}"><a href="{{SiteVars.RelativeWebRoot}}admin/#/content/tags">@Resources.labels.tags</a></li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2 class="page-title pull-left">
8080
<tr id="tr-spinner"><td colspan="5"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
8181
</tbody>
8282
</table>
83-
<div class="text-right pagination-wrapper">
83+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
8484
<ul class="pagination pagination-sm">
8585
<li data-ng-class="{disabled: currentPage == 0}">
8686
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<h2 class="page-title pull-left">
44
{{lbl.comments}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
55
</h2>
6+
<a href="#/content/filters" class="btn btn-success btn-header pull-right" type="button"><i class="fa fa-filter"></i>{{lbl.filters}}</a>
67
</div>
78
<div class="content-inner">
89
<div class="toolbar-grid clearfix">
@@ -60,7 +61,7 @@ <h2 class="page-title pull-left">
6061
<tr id="tr-spinner"><td colspan="7"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
6162
</tbody>
6263
</table>
63-
<div class="text-right pagination-wrapper">
64+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
6465
<ul class="pagination pagination-sm">
6566
<li data-ng-class="{disabled: currentPage == 0}">
6667
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>

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

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<div data-ng-controller="CommentFilterController">
2+
<div class="page-header clearfix">
3+
<h2 class="page-title pull-left">
4+
{{lbl.filters}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
5+
</h2>
6+
<button data-toggle="modal" data-target="#AddFilter" class="btn btn-success btn-sm btn-tabkey pull-right"><i class="fa fa-plus"></i>{{lbl.add}}</button>
7+
<button type="button" class="btn btn-default btn-header btn-tabkey pull-right" onclick="window.history.back()"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
8+
</div>
9+
<div class="modal fade" id="AddFilter" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
10+
<div class="modal-dialog">
11+
12+
<div class="modal-content">
13+
<div class="modal-header">
14+
<button type="button" class="close" data-dismiss="modal" ng-click="focusInput=false" aria-hidden="true"><i class="fa fa-times"></i></button>
15+
<h4 class="modal-title">Add Filter</h4>
16+
</div>
17+
<!--<form id="form" action="" style="margin:0;">-->
18+
<div class="modal-body">
19+
<div class="form-horizontal">
20+
<div class="form-group">
21+
<label class="control-label col col-md-3">Action</label>
22+
<div class="col col-md-9">
23+
<select class="form-control" id="ddAction" name="ddAction">
24+
<option value="Block" selected="selected">Block</option>
25+
<option value="Allow">Allow</option>
26+
<option value="Delete">Delete</option>
27+
</select>
28+
</div>
29+
</div>
30+
<div class="form-group">
31+
<label class="control-label col col-md-3">Subject</label>
32+
<div class="col col-md-9">
33+
<select class="form-control" id="ddSubject" name="ddSubject">
34+
<option value="IP" selected="selected">IP</option>
35+
<option value="Author">Author</option>
36+
<option value="Website">Website</option>
37+
<option value="Email">E-mail</option>
38+
<option value="Comment">Comment</option>
39+
</select>
40+
</div>
41+
</div>
42+
<div class="form-group">
43+
<label class="control-label col col-md-3">Operator</label>
44+
<div class="col col-md-9">
45+
<select class="form-control" id="ddOperator" name="ddOperator">
46+
<option value="Equals" selected="selected">Equals</option>
47+
<option value="Contains">Contains</option>
48+
</select>
49+
</div>
50+
</div>
51+
<div class="form-group">
52+
<label class="control-label col col-md-3">Filter</label>
53+
<div class="col col-md-9">
54+
<input type="text" class="form-control" id="txtFilter" maxlength="250" name="txtFilter">
55+
</div>
56+
</div>
57+
</div>
58+
</div>
59+
<div class="modal-footer">
60+
<input data-ng-click="addFilter()" class="btn btn-success pull-right btn-tabkey " type="button" value="Add Filter">
61+
<button type="button" class="btn btn-default ng-binding" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>Cancel</button>
62+
</div>
63+
<!--</form>-->
64+
</div>
65+
66+
</div>
67+
</div>
68+
<div class="content-inner">
69+
<div class="toolbar-grid clearfix">
70+
<div class="pull-left">
71+
<button ng-disabled="itemsChecked() === false" ng-click="processChecked('delete')" class="btn btn-sm btn-danger"><i class="fa fa-times"></i>{{lbl.doDelete}}</button>
72+
<button ng-disabled="items.length === 0" data-ng-click="deleteAll()" class="btn btn-sm btn-danger" type="button"><i class="fa fa-times"></i>{{lbl.deleteAll}}</button>
73+
</div>
74+
<div class="pull-right">
75+
<input type="text" ng-model="query" ng-change="search()" class="form-control input-sm pull-right" placeholder="{{lbl.search}}">
76+
</div>
77+
</div>
78+
<table class="table table-bordered table-striped table-hover table-responsive">
79+
<thead>
80+
<tr>
81+
<th>
82+
<input type="checkbox" id="chkAll" data-ng-click="checkAll($event)" />
83+
</th>
84+
<th class="table-item-title hmax768">Action</th>
85+
<th class="hmax768">Subject</th>
86+
<th class="hmax768">Operator</th>
87+
<th class="hmax768">Filter</th>
88+
</tr>
89+
</thead>
90+
<tbody>
91+
<tr data-ng-repeat="item in pagedItems[currentPage]">
92+
<td> <input type="checkbox" data-ng-model="item.IsChecked" /> </td>
93+
<td><span class="pull-left">{{item.Action}}</span></td>
94+
<td><span class="pull-left">{{item.Subject}}</span></td>
95+
<td><span class="pull-left">{{item.Operation}}</span></td>
96+
<td class="table-item-title">
97+
{{item.Filter}}
98+
</td>
99+
</tr>
100+
<tr id="tr-spinner"><td colspan="5"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
101+
</tbody>
102+
</table>
103+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
104+
<ul class="pagination pagination-sm">
105+
<li data-ng-class="{disabled: currentPage == 0}">
106+
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>
107+
</li>
108+
<li data-ng-repeat="n in range(pagedItems.length)" data-ng-class="{active: n == currentPage}" data-ng-click="setPage()">
109+
<a data-ng-bind="n + 1">1</a>
110+
</li>
111+
<li data-ng-class="{disabled: currentPage == pagedItems.length - 1}">
112+
<a data-ng-click="nextPage()">{{lbl.next}} »</a>
113+
</li>
114+
</ul>
115+
</div>
116+
</div>
117+
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ <h2 class="page-title pull-left">
5656
<tr id="tr-spinner"><td colspan="7"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
5757
</tbody>
5858
</table>
59-
<div class="text-right pagination-wrapper">
59+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
6060
<ul class="pagination pagination-sm">
6161
<li data-ng-class="{disabled: currentPage == 0}">
6262
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h2 class="page-title pull-left">
6767
<tr id="tr-spinner"><td colspan="6"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
6868
</tbody>
6969
</table>
70-
<div class="text-right pagination-wrapper">
70+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
7171
<ul class="pagination pagination-sm">
7272
<li data-ng-class="{disabled: currentPage == 0}">
7373
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>

0 commit comments

Comments
 (0)