Skip to content

Commit 46eb5cf

Browse files
rxturrxtur
committed
Few template/style updates in admin
1 parent fd4f7c3 commit 46eb5cf

File tree

4 files changed

+52
-52
lines changed

4 files changed

+52
-52
lines changed

‎BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,40 +107,40 @@ <h4 class="modal-title">{{modalTitle}}</h4>
107107
</div>
108108
<div class="page-header clearfix">
109109
<h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
110-
{{lbl.blogs}}</h2>
111-
<button data-ng-click="modalNew()" class="btn btn-success btn-header pull-left"><i class="fa fa-plus"></i>New</button>
110+
{{lbl.blogs}}
111+
</h2>
112+
<button data-ng-click="modalNew()" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</button>
112113
<div class="btn-group befdv pull-left">
113114
<button ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i>{{lbl.doDelete}}</button>
114115
</div>
115116
<div class="search pull-right">
116117
<i class="fa fa-search"></i>
117-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
118-
<i class="fa fa-times-circle"></i>
118+
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}..." />
119119
</div>
120120
</div>
121121
<div class="content-inner">
122-
<table class="table table-responsive">
122+
<table class="table table-item-post">
123123
<thead>
124124
<tr>
125-
<th><input type="checkbox" id="chkAll" ng-click="checkAll($event)" /></th>
126-
<th class="table-item-title table-item-w60"><a data-ng-click="sort_by('Title',$event)">{{lbl.title}}</a></th>
127-
<th class="hmax768">{{lbl.virtualPath}}</th>
128-
<th>{{lbl.primary}}</th>
129-
<th>{{lbl.active}}</th>
130-
<th class="hmax768">{{lbl.isForSiteAggregation}}</th>
125+
<th class="item-checkbox"><input type="checkbox" id="chkAll" ng-click="checkAll($event)" /></th>
126+
<th class="item-title"><a data-ng-click="sort_by('Title',$event)">{{lbl.title}}</a></th>
127+
<th class="item-author">{{lbl.virtualPath}}</th>
128+
<th class="item-state">{{lbl.primary}}</th>
129+
<th class="item-state">{{lbl.active}}</th>
130+
<th class="item-state">{{lbl.isForSiteAggregation}}</th>
131131
</tr>
132132
</thead>
133133
<tbody>
134134
<tr data-ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder:reverse">
135135
<td><input type="checkbox" id="{{item.Slug}}" ng-model="item.IsChecked" data-ng-disabled="item.IsPrimary" /></td>
136-
<td class="table-item-title">
136+
<td class="item-title">
137137
<a title="{{item.Name}}" href="" ng-click="modalEdit(item.Id)">{{item.Name}}</a>
138138
<a title="{{item.Name}}" class="external-link pull-right" target="_blank" href="{{item.RelativeWebRoot}}"><i class="fa fa-external-link"></i></a>
139139
</td>
140-
<td class="ltr-dir hmax768">{{item.VirtualPath}}</td>
141-
<td><input type="checkbox" ng-model="item.IsPrimary" data-ng-disabled="true" /></td>
142-
<td><input type="checkbox" ng-model="item.IsActive" data-ng-disabled="true" /></td>
143-
<td class="hmax768"><input type="checkbox" data-ng-model="item.IsSiteAggregation" data-ng-disabled="true"></td>
140+
<td class="item-author">{{item.VirtualPath}}</td>
141+
<td class="item-state"><input type="checkbox" ng-model="item.IsPrimary" data-ng-disabled="true" /></td>
142+
<td class="item-state"><input type="checkbox" ng-model="item.IsActive" data-ng-disabled="true" /></td>
143+
<td class="item-state"><input type="checkbox" data-ng-model="item.IsSiteAggregation" data-ng-disabled="true"></td>
144144
</tr>
145145
<tr id="tr-spinner"><td colspan="6"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
146146
</tbody>

‎BlogEngine/BlogEngine.NET/admin/app/settings/controls/blogrollView.html

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,32 +86,30 @@ <h4 class="modal-title">{{modalTitle}}</h4>
8686
<h2 class="page-title pull-left">
8787
{{lbl.blogroll}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
8888
</h2>
89-
<a href="" ng-click="modalNew()" class="btn btn-success pull-left"><i class="fa fa-plus"></i>New</a>
89+
<a href="" ng-click="modalNew()" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>New</a>
9090
<div class="btn-group befdv pull-left">
91-
<button ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-danger" title="{{lbl.doDelete}}"><i class="fa fa-trash"></i></button>
91+
<button ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" title="{{lbl.doDelete}}"><i class="fa fa-trash"></i></button>
9292
</div>
9393
</div>
9494
<div class="content-inner">
95-
<table class="table table-bordered table-striped table-hover table-responsive">
95+
<table class="table table-item-blogroll">
9696
<thead>
9797
<tr>
98-
<th>
99-
<input type="checkbox" id="chkAll" data-ng-click="checkAll($event)" />
100-
</th>
101-
<th class="table-item-title ">{{lbl.title}}</th>
102-
<th class="hmax768">{{lbl.description}}</th>
103-
<th class="hmax768">XFN <a href="http://gmpg.org/xfn/intro" title="XFN" target="_blank"><i class="fa fa-info-circle"></i></a></th>
98+
<th class="item-checkbox"><input type="checkbox" id="chkAll" data-ng-click="checkAll($event)" /></th>
99+
<th class="item-title">{{lbl.title}}</th>
100+
<th class="item-desc">{{lbl.description}}</th>
101+
<th class="item-state">XFN <a href="http://gmpg.org/xfn/intro" title="XFN" target="_blank"><i class="fa fa-info-circle"></i></a></th>
104102
</tr>
105103
</thead>
106104
<tbody>
107105
<tr data-ng-repeat="item in pagedItems[currentPage]">
108-
<td> <input type="checkbox" data-ng-model="item.IsChecked" /> </td>
109-
<td class="table-item-title">
106+
<td class="item-checkbox"><input type="checkbox" data-ng-model="item.IsChecked" /> </td>
107+
<td class="item-title">
110108
<a title="{{item.Title}}" href="" ng-click="modalEdit(item.Id)" class="text-ellipsis pull-left">{{item.Title}}</a>
111109
<a title="{{item.FeedUrl}}" class="external-link pull-right" target="_blank" href="{{item.FeedUrl}}"><i class="fa fa-external-link"></i></a>
112110
</td>
113-
<td class="hmax768"><span class="pull-left">{{item.Description}}</span></td>
114-
<td class="hmax768"><span class="pull-left">{{item.Xfn}}</span></td>
111+
<td class="item-desc"><span class="pull-left">{{item.Description}}</span></td>
112+
<td class="item-state"><span class="pull-left">{{item.Xfn}}</span></td>
115113
</tr>
116114
<tr id="tr-spinner"><td colspan="4"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
117115
</tbody>

‎BlogEngine/BlogEngine.NET/admin/app/settings/controls/pingView.html

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@ <h4 class="modal-title">{{lbl.add_Entry}}</h4>
2828
<h2 class="page-title pull-left">
2929
{{lbl.pingService}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
3030
</h2>
31-
<button ng-click="modalNew()" class="btn btn-success btn-header pull-right" type="button"><i class="fa fa-plus"></i>{{lbl.add}}</button>
31+
<button ng-click="modalNew()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-plus"></i>{{lbl.add}}</button>
32+
<div class="btn-group befdv pull-left">
33+
<button ng-disabled="itemsChecked() === false" ng-click="processChecked('delete')" class="btn btn-sm btn-danger"><i class="fa fa-trash"></i>{{lbl.doDelete}}</button>
34+
</div>
3235
</div>
3336
<div class="content-inner">
34-
<div class="toolbar-grid clearfix">
35-
<div class="pull-left">
36-
<button ng-disabled="itemsChecked() === false" ng-click="processChecked('delete')" class="btn btn-danger btn-sm"><i class="fa fa-times"></i>{{lbl.doDelete}}</button>
37-
</div>
38-
</div>
39-
4037
<table class="table table-bordered table-striped table-hover table-responsive">
4138
<thead>
4239
<tr>
@@ -53,22 +50,19 @@ <h2 class="page-title pull-left">
5350
<a title="{{item.OptionName}}" target="_blank" href="{{item.ServiceUrl}}" class="text-ellipsis pull-left">{{item.ServiceUrl}}</a>
5451
</td>
5552
</tr>
56-
<tr id="tr-spinner"><td colspan="2"><div id="div-spinner"><i class="fa fa-spinner fa-spin"></i></div></td></tr>
5753
</tbody>
5854
</table>
59-
<div class="text-right pagination-wrapper">
60-
<ul class="pagination pagination-sm">
61-
<li data-ng-class="{disabled: currentPage == 0}">
62-
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>
63-
</li>
64-
<li data-ng-repeat="n in range(pagedItems.length)" data-ng-class="{active: n == currentPage}" data-ng-click="setPage()">
65-
<a data-ng-bind="n + 1">1</a>
66-
</li>
67-
<li data-ng-class="{disabled: currentPage == pagedItems.length - 1}">
68-
<a data-ng-click="nextPage()">{{lbl.next}} »</a>
69-
</li>
70-
</ul>
71-
</div>
55+
<ul class="pagination" ng-if="items.length > itemsPerPage">
56+
<li data-ng-class="{disabled: currentPage == 0}">
57+
<a data-ng-click="prevPage()" title="{{lbl.prev}}"><i class="fa fa-angle-left"></i></a>
58+
</li>
59+
<li data-ng-repeat="n in range(pagedItems.length)" data-ng-class="{active: n == currentPage}" data-ng-click="setPage()">
60+
<a data-ng-bind="n + 1">1</a>
61+
</li>
62+
<li data-ng-class="{disabled: currentPage == pagedItems.length - 1}">
63+
<a data-ng-click="nextPage()" title="{{lbl.next}}"><i class="fa fa-angle-right"></i></a>
64+
</li>
65+
</ul>
7266
</div>
7367
</form>
7468
</div>

‎BlogEngine/BlogEngine.NET/setup/SQLServer/DbWeb.Config

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,21 @@
248248
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
249249
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
250250
</dependentAssembly>
251+
<dependentAssembly>
252+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
253+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
254+
</dependentAssembly>
251255
<dependentAssembly>
252256
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
253257
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
254258
</dependentAssembly>
255259
<dependentAssembly>
256-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
257-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
260+
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
261+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
262+
</dependentAssembly>
263+
<dependentAssembly>
264+
<assemblyIdentity name="SimpleInjector.Extensions.ExecutionContextScoping" publicKeyToken="984cb50dea722e99" culture="neutral" />
265+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
258266
</dependentAssembly>
259267
</assemblyBinding>
260268
</runtime>

0 commit comments

Comments
 (0)