Skip to content

Commit 7e3dc53

Browse files
committed
Post and page editors moved under /app/editor
1 parent d512f96 commit 7e3dc53

File tree

15 files changed

+27
-20
lines changed

15 files changed

+27
-20
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static void RegisterBundles(BundleCollection bundles)
123123
.Include("~/admin/app/listpager.js")
124124
.Include("~/admin/app/grid-helpers.js")
125125
.Include("~/admin/app/data-service.js")
126-
.Include("~/admin/app/fileManager.js")
126+
.Include("~/admin/app/editor/filemanagerController.js")
127127
.Include("~/admin/app/common.js")
128128

129129
.Include("~/admin/app/dashboard/dashboardController.js")
@@ -164,10 +164,10 @@ static void RegisterBundles(BundleCollection bundles)
164164
.Include("~/scripts/moment.js")
165165
.Include("~/admin/app/app.js")
166166
.Include("~/admin/app/grid-helpers.js")
167-
.Include("~/admin/app/editor-helpers.js")
168-
.Include("~/admin/app/postEditor.js")
169-
.Include("~/admin/app/pageEditor.js")
170-
.Include("~/admin/app/fileManager.js")
167+
.Include("~/admin/app/editor/editor-helpers.js")
168+
.Include("~/admin/app/editor/posteditorController.js")
169+
.Include("~/admin/app/editor/pageeditorController.js")
170+
.Include("~/admin/app/editor/filemanagerController.js")
171171
.Include("~/admin/app/common.js")
172172
.Include("~/admin/app/data-service.js")
173173
);

BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@
155155
<Content Include="Account\Web.Config" />
156156
<Content Include="admin\app\grid-helpers.js" />
157157
<Content Include="admin\app\content\comments\commentFilters.js" />
158-
<Content Include="admin\app\editor-helpers.js" />
158+
<Content Include="admin\app\editor\editor-helpers.js" />
159159
<Content Include="admin\app\listpager.js" />
160-
<Content Include="admin\app\pageEditor.js" />
160+
<Content Include="admin\app\editor\pageeditorController.js" />
161161
<Content Include="admin\app\settings\controls\pingController.js" />
162162
<Content Include="admin\app\settings\controls\blogrollController.js" />
163-
<Content Include="admin\app\fileManager.js" />
164-
<Content Include="admin\app\postEditor.js" />
163+
<Content Include="admin\app\editor\filemanagerController.js" />
164+
<Content Include="admin\app\editor\posteditorController.js" />
165165
<Content Include="admin\app\data-service.js" />
166166
<Content Include="admin\app\settings\tools\toolController.js" />
167167
<Content Include="admin\editors\bootstrap-wysiwyg\bootstrap-wysiwyg.js" />
@@ -283,9 +283,6 @@
283283
<Content Include="admin\editors\tinymce\skins\lightgray\fonts\tinymce.woff" />
284284
<Content Include="admin\themes\standard\layout.cshtml" />
285285
<Content Include="admin\themes\standard\sidebar.cshtml" />
286-
<Content Include="admin\editpost.cshtml" />
287-
<Content Include="admin\editpage.cshtml" />
288-
<Content Include="admin\filemanager.cshtml" />
289286
<Content Include="AppCode\Wlw\TagMiniView.aspx" />
290287
<Content Include="AppCode\Wlw\wlw.css" />
291288
<Content Include="App_Data\labels.txt" />
@@ -679,6 +676,10 @@
679676
<Content Include="Custom\Themes\Standard-minimal\fonts\FontAwesome.otf" />
680677
<Content Include="Custom\Themes\Standard-minimal\fonts\Yekan.woff" />
681678
<Content Include="Custom\Themes\Standard-minimal\site.master" />
679+
<Content Include="admin\app\editor\editpage.cshtml" />
680+
<Content Include="admin\app\editor\editpost.cshtml" />
681+
<Content Include="admin\app\editor\filemanager.cshtml" />
682+
<Content Include="admin\app\editor\Web.Config" />
682683
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
683684
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
684685
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

BlogEngine/BlogEngine.NET/admin/app/content/pages/pageView.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
44
{{lbl.pages}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
55
</h2>
6-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpage.cshtml" class="btn btn-hasicon btn-sm btn-success pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
6+
<a href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpage.cshtml" class="btn btn-hasicon btn-sm btn-success pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
77
<div class="btn-group befdv pull-left">
88
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
99
<a ng-click="processChecked('unpublish')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-warning" angular-tooltip tooltip="lbl.unpublish"><i class="fa fa-archive"></i></a>
@@ -42,7 +42,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
4242
<tr data-ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder:reverse">
4343
<td class="item-checkbox"><input type="checkbox" id="{{item.Slug}}" data-ng-model="item.IsChecked" ng-disabled="item.HasChildren === true" /></td>
4444
<td class="item-title">
45-
<a title="click to edit" href="{{SiteVars.RelativeWebRoot}}admin/editpage.cshtml?id={{item.Id}}">{{item.Title}}</a>
45+
<a title="click to edit" href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpage.cshtml?id={{item.Id}}">{{item.Title}}</a>
4646
<a title="click to view" target="_blank" href="{{item.RelativeLink}}" class="external-link"><i class="fa fa-external-link"></i></a>
4747
</td>
4848
<td class="item-parent">{{item.Parent.OptionName}}</td>

BlogEngine/BlogEngine.NET/admin/app/content/posts/postView.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2 class="page-title pull-left">
66
<a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
77
{{lbl.posts}}
88
</h2>
9-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpost.cshtml" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
9+
<a href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpost.cshtml" class="btn btn-success btn-sm btn-hasicon pull-left"><i class="fa fa-plus"></i>{{lbl.theNew}}</a>
1010
<div class="btn-group befdv pull-left">
1111
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
1212
<a ng-click="processChecked('unpublish')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-warning" angular-tooltip tooltip="lbl.unpublish"><i class="fa fa-archive"></i></a>
@@ -44,7 +44,7 @@ <h2 class="page-title pull-left">
4444
<tr data-ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder:reverse">
4545
<td class="item-checkbox"><input type="checkbox" id="{{item.Slug}}" data-ng-model="item.IsChecked" /></td>
4646
<td class="item-title">
47-
<a title="click to edit" href="{{SiteVars.RelativeWebRoot}}admin/editpost.cshtml?id={{item.Id}}">{{item.Title}}</a>
47+
<a title="click to edit" href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpost.cshtml?id={{item.Id}}">{{item.Title}}</a>
4848
<a title="click to view" class="external-link" target="_blank" href="{{item.RelativeLink}}"><i class="fa fa-external-link"></i></a>
4949
</td>
5050
<td class="item-author"><a href="" title="{{item.Author}}" ng-click="gridFilter('Author',item.Author,'')">{{item.Author}}</a></td>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
104104
</div>
105105
<ul class="list-group list-group">
106106
<li class="list-group-item clearfix" data-ng-repeat="post in vm.DraftPosts">
107-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpost.cshtml?id={{post.Id}}&returnUrl={{SiteVars.RelativeWebRoot}}admin/#/">{{post.Title}}</a>
107+
<a href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpost.cshtml?id={{post.Id}}&returnUrl={{SiteVars.RelativeWebRoot}}admin/#/">{{post.Title}}</a>
108108
<a title="{{post.Title}}" class="external-link" target="_new" href="{{post.RelativeLink}}"><i class="fa fa-external-link"></i></a>
109109
</li>
110110
<li ng-if="vm.DraftPosts.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
@@ -116,7 +116,7 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
116116
</div>
117117
<ul class="list-group list-group">
118118
<li class="list-group-item clearfix" data-ng-repeat="page in vm.DraftPages">
119-
<a href="{{SiteVars.RelativeWebRoot}}admin/editpage.cshtml?id={{page.Id}}&returnUrl={{SiteVars.RelativeWebRoot}}admin/#/">{{page.Title}}</a>
119+
<a href="{{SiteVars.RelativeWebRoot}}admin/app/editor/editpage.cshtml?id={{page.Id}}&returnUrl={{SiteVars.RelativeWebRoot}}admin/#/">{{page.Title}}</a>
120120
<a title="{{page.Title}}" class="external-link" target="_new" href="{{SiteVars.RelativeWebRoot}}page/{{page.Slug}}"><i class="fa fa-external-link"></i></a>
121121
</li>
122122
<li ng-if="vm.DraftPages.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<system.web>
4+
<pages enableSessionState="true" />
5+
</system.web>
6+
</configuration>

BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/filemanager/plugin.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ tinymce.PluginManager.add("filemanager", function (editor, url) {
44
onclick: function () {
55
editor.windowManager.open({
66
title: "File manager",
7-
url: SiteVars.RelativeWebRoot + "admin/filemanager.cshtml",
7+
url: SiteVars.RelativeWebRoot + "admin/app/editor/filemanager.cshtml",
88
width: window.innerWidth * 0.9,
99
height: window.innerHeight * 0.8
1010
}, {

BlogEngine/BlogEngine.NET/page.aspx.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public string AdminLinks
166166
if (sb.Length > 0) { sb.Append(" | "); }
167167

168168
sb.AppendFormat(
169-
"<a href=\"{0}admin/editpage.cshtml?id={1}\">{2}</a>",
169+
"<a href=\"{0}admin/post/editor/editpage.cshtml?id={1}\">{2}</a>",
170170
Utils.RelativeWebRoot,
171171
this.Page.Id,
172172
labels.edit);

0 commit comments

Comments
 (0)