Skip to content

Commit 162eac6

Browse files
rxturrxtur
committed
Small tweaks in admin
1 parent f765933 commit 162eac6

6 files changed

Lines changed: 18 additions & 16 deletions

File tree

‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,14 @@ static void RegisterBundles(BundleCollection bundles)
108108

109109
bundles.Add(
110110
new ScriptBundle("~/scripts/blogadmin")
111-
.Include("~/scripts/jquery-2.1.1.js")
112-
.Include("~/scripts/jquery.form.js")
113-
.Include("~/scripts/jquery.validate.js")
114-
.Include("~/scripts/toastr.js")
115-
.Include("~/scripts/Q.js")
111+
.Include("~/Scripts/jquery-2.1.1.js")
112+
.Include("~/Scripts/jquery.form.js")
113+
.Include("~/Scripts/jquery.validate.js")
114+
.Include("~/Scripts/toastr.js")
115+
.Include("~/Scripts/owl.carousel.min.js")
116+
.Include("~/Scripts/bootstrap.js")
117+
.Include("~/Scripts/moment.js")
118+
.Include("~/Scripts/Q.js")
116119
.Include("~/Scripts/angular.min.js")
117120
.Include("~/Scripts/angular-route.min.js")
118121
.Include("~/Scripts/angular-animate.min.js")
@@ -142,8 +145,6 @@ static void RegisterBundles(BundleCollection bundles)
142145
.Include("~/admin/app/controllers/custom.js")
143146
.Include("~/admin/app/controllers/package.js")
144147
.Include("~/admin/app/controllers/common.js")
145-
.Include("~/scripts/bootstrap.js")
146-
.Include("~/scripts/moment.js")
147148
.Include("~/admin/editors/summernote/summernote.js")
148149
);
149150

‎BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/be_WIDGET_ZONE.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<widgets>
33
<widget id="42fcbe7c-2c9c-440a-bad9-65a94472fccc" title="Administration" showTitle="True">Administration</widget>
4-
<widget id="fb38ecdd-5813-4d10-8c5f-8d901c7c731e" title="Search" showTitle="True">Search</widget>
4+
<widget id="fb38ecdd-5813-4d10-8c5f-8d901c7c731e" title="Search" showTitle="False">Search</widget>
55
<widget id="e02e41df-35d8-4572-a862-0dd0fb2fa504" title="Calendar" showTitle="True">Calendar</widget>
66
<widget id="dd0a6215-8f33-441e-83c8-9f2ae0abae27" title="Category list" showTitle="True">Category list</widget>
77
<widget id="8d2f6869-e27d-4585-bada-a9cc84f0978a" title="Tag cloud" showTitle="True">Tag cloud</widget>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@
134134
.success(function (data) {
135135
angular.copy(data, $scope.packages);
136136
$scope.checkNewVersion();
137-
if ($scope.packages.length > 0) { $('#tr-gal-spinner').hide(); }
137+
if ($scope.packages.length > 0) {
138+
$('#tr-gal-spinner').hide();
139+
$(".owl-carousel").owlCarousel();
140+
}
138141
else { $('#div-gal-spinner').html(BlogAdmin.i18n.empty); }
139142
})
140143
.error(function () {
@@ -167,6 +170,10 @@
167170
.error(function () { toastr.error($rootScope.lbl.errorLoadingTrash); });
168171
}
169172

173+
$(document).ready(function () {
174+
175+
});
176+
170177
$scope.load();
171178

172179
$scope.noteId = '';

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,12 @@
5050
</div>
5151
@RenderBody()
5252
</div>
53-
<script src="/scripts/owl.carousel.min.js"></script>
5453
<script>
5554
$(document).ready(function () {
5655
$(".nav-toggle").click(function () {
5756
$(".wrapper").toggleClass("sidebar-icon");
5857
})
5958
});
60-
$(document).ready(function () {
61-
$(".owl-carousel").owlCarousel();
62-
});
6359
</script>
6460
</body>
6561
</html>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868
}
6969
</ul>
7070
</li>
71-
@*<li id="mu-gallery"><i class="fa fa-cloud-download"></i><a href="{{SiteVars.RelativeWebRoot}}admin/#/gallery"><span>@Resources.labels.gallery</span></a></li>*@
72-
<li id="mu-help"><i class="fa fa-question-circle"></i><a href="{{SiteVars.RelativeWebRoot}}admin/#/help"><span>Help Center</span></a></li>
7371
<li id="mu-about"><i class="fa fa-info-circle"></i><a href="{{SiteVars.RelativeWebRoot}}admin/#/about"><span>BlogEngine @BlogEngine.Core.BlogSettings.Instance.Version().Substring(0, 3)</span></a></li>
7472
</ul>
7573

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
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>
147147
</table>
148-
<div class="text-right">
148+
<div class="text-right pagination-wrapper" ng-if="items.length > itemsPerPage">
149149
<ul class="pagination pagination-sm">
150150
<li data-ng-class="{disabled: currentPage == 0}">
151151
<a data-ng-click="prevPage()">« {{lbl.prev}}</a>

0 commit comments

Comments
 (0)