Skip to content

Commit de55eda

Browse files
rxturrxtur
committed
More cleanup in admin
1 parent 83cc753 commit de55eda

41 files changed

Lines changed: 135 additions & 9887 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.2.2")]
22+
[assembly: AssemblyVersion("3.1.2.3")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Web/Controls/PostViewBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public virtual string AdminLinks
216216
sb.AppendFormat(
217217
CultureInfo.InvariantCulture,
218218
"<a href=\"{0}\">{1}</a> | ",
219-
Post.Blog.AbsoluteWebRoot + "admin/editor/post.cshtml?id=" + this.Post.Id,
219+
Post.Blog.AbsoluteWebRoot + "admin/editpost.cshtml?id=" + this.Post.Id,
220220
Utils.Translate("edit"));
221221
}
222222

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

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ public static void Initialize(HttpContext context)
3232
WidgetZone.PreloadWidgetsAsync("be_WIDGET_ZONE");
3333
Utils.LoadExtensions();
3434

35-
BlogEngineConfig.RegisterBundles(BundleTable.Bundles);
35+
RegisterBundles(BundleTable.Bundles);
3636

37-
BlogEngineConfig.RegisterWebApi(GlobalConfiguration.Configuration);
37+
RegisterWebApi(GlobalConfiguration.Configuration);
3838

3939
RegisterUnity(GlobalConfiguration.Configuration);
4040

4141
ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
4242
new ScriptResourceDefinition
4343
{
44-
Path = "~/Scripts/jquery-1.9.1.min.js",
45-
DebugPath = "~/Scripts/jquery-1.9.1.js",
46-
CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-1.9.1.min.js",
47-
CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-1.9.1.js"
44+
Path = "~/Scripts/jquery-2.1.1.min.js",
45+
DebugPath = "~/Scripts/jquery-2.1.1.js",
46+
CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.1.min.js",
47+
CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.1.js"
4848
});
4949

5050
_initializedAlready = true;
@@ -103,7 +103,6 @@ static void RegisterBundles(BundleCollection bundles)
103103
.Include("~/Content/bootstrap.min.css")
104104
.Include("~/Content/toastr.css")
105105
.Include("~/Content/font-awesome.min.css")
106-
.Include("~/Content/editor.css")
107106
.Include("~/Content/star-rating.css")
108107
);
109108

@@ -119,30 +118,30 @@ static void RegisterBundles(BundleCollection bundles)
119118
.Include("~/Scripts/angular-animate.min.js")
120119
.Include("~/Scripts/angular-sanitize.min.js")
121120
.Include("~/admin/app.js")
122-
.Include("~/admin/controllers/grid-helpers.js")
123-
.Include("~/admin/controllers/dashboard.js")
124-
.Include("~/admin/controllers/blogs.js")
125-
.Include("~/admin/controllers/help.js")
126-
.Include("~/admin/controllers/about.js")
127-
.Include("~/admin/controllers/posts.js")
128-
.Include("~/admin/controllers/listpager.js")
129-
.Include("~/admin/controllers/pages.js")
130-
.Include("~/admin/controllers/tags.js")
131-
.Include("~/admin/controllers/categories.js")
132-
.Include("~/admin/controllers/files.js")
133-
.Include("~/admin/controllers/comments.js")
134-
.Include("~/admin/controllers/users.js")
135-
.Include("~/admin/controllers/roles.js")
136-
.Include("~/admin/controllers/profile.js")
137-
.Include("~/admin/controllers/settings.js")
138-
.Include("~/admin/controllers/tools.js")
139-
.Include("~/admin/controllers/commentfilters.js")
140-
.Include("~/admin/controllers/blogroll.js")
141-
.Include("~/admin/controllers/pings.js")
142-
.Include("~/admin/controllers/custom.js")
143-
.Include("~/admin/controllers/package.js")
144-
.Include("~/admin/controllers/common.js")
145-
.Include("~/admin/controllers/data-service.js")
121+
.Include("~/admin/app/listpager.js")
122+
.Include("~/admin/app/grid-helpers.js")
123+
.Include("~/admin/app/data-service.js")
124+
.Include("~/admin/app/controllers/dashboard.js")
125+
.Include("~/admin/app/controllers/blogList.js")
126+
.Include("~/admin/app/controllers/help.js")
127+
.Include("~/admin/app/controllers/about.js")
128+
.Include("~/admin/app/controllers/posts.js")
129+
.Include("~/admin/app/controllers/pages.js")
130+
.Include("~/admin/app/controllers/tags.js")
131+
.Include("~/admin/app/controllers/categories.js")
132+
.Include("~/admin/app/controllers/files.js")
133+
.Include("~/admin/app/controllers/commentList.js")
134+
.Include("~/admin/app/controllers/users.js")
135+
.Include("~/admin/app/controllers/roles.js")
136+
.Include("~/admin/app/controllers/profile.js")
137+
.Include("~/admin/app/controllers/settings.js")
138+
.Include("~/admin/app/controllers/tools.js")
139+
.Include("~/admin/app/controllers/commentFilters.js")
140+
.Include("~/admin/app/controllers/blogRoll.js")
141+
.Include("~/admin/app/controllers/pings.js")
142+
.Include("~/admin/app/controllers/custom.js")
143+
.Include("~/admin/app/controllers/package.js")
144+
.Include("~/admin/app/controllers/common.js")
146145
.Include("~/scripts/bootstrap.js")
147146
.Include("~/scripts/moment.js")
148147
.Include("~/admin/editors/summernote/summernote.js")
@@ -162,13 +161,13 @@ static void RegisterBundles(BundleCollection bundles)
162161
.Include("~/scripts/textext.js")
163162
.Include("~/scripts/moment.js")
164163
.Include("~/admin/app.js")
165-
.Include("~/admin/controllers/grid-helpers.js")
166-
.Include("~/admin/controllers/editor-helpers.js")
167-
.Include("~/admin/controllers/editor-post.js")
168-
.Include("~/admin/controllers/editor-page.js")
169-
.Include("~/admin/controllers/files.js")
170-
.Include("~/admin/controllers/common.js")
171-
.Include("~/admin/controllers/data-service.js")
164+
.Include("~/admin/app/grid-helpers.js")
165+
.Include("~/admin/app/editor-helpers.js")
166+
.Include("~/admin/app/controllers/postEditor.js")
167+
.Include("~/admin/app/controllers/pageEditor.js")
168+
.Include("~/admin/app/controllers/files.js")
169+
.Include("~/admin/app/controllers/common.js")
170+
.Include("~/admin/app/data-service.js")
172171
);
173172

174173
if (BlogConfig.DefaultEditor == "~/admin/editors/bootstrap-wysiwyg/editor.cshtml")

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,21 @@
123123
<Content Include="Account\account.master" />
124124
<Content Include="Account\Logout.cshtml" />
125125
<Content Include="Account\Web.Config" />
126-
<Content Include="admin\controllers\about.js" />
127-
<Content Include="admin\controllers\grid-helpers.js" />
128-
<Content Include="admin\controllers\commentfilters.js" />
129-
<Content Include="admin\controllers\editor-helpers.js" />
130-
<Content Include="admin\controllers\help.js" />
131-
<Content Include="admin\controllers\listpager.js" />
132-
<Content Include="admin\controllers\custom.js" />
133-
<Content Include="admin\controllers\package.js" />
134-
<Content Include="admin\controllers\editor-page.js" />
135-
<Content Include="admin\controllers\pings.js" />
136-
<Content Include="admin\controllers\blogroll.js" />
137-
<Content Include="admin\controllers\files.js" />
138-
<Content Include="admin\controllers\editor-post.js" />
139-
<Content Include="admin\controllers\data-service.js" />
140-
<Content Include="admin\controllers\tools.js" />
126+
<Content Include="admin\app\controllers\about.js" />
127+
<Content Include="admin\app\grid-helpers.js" />
128+
<Content Include="admin\app\controllers\commentFilters.js" />
129+
<Content Include="admin\app\editor-helpers.js" />
130+
<Content Include="admin\app\controllers\help.js" />
131+
<Content Include="admin\app\listpager.js" />
132+
<Content Include="admin\app\controllers\custom.js" />
133+
<Content Include="admin\app\controllers\package.js" />
134+
<Content Include="admin\app\controllers\pageEditor.js" />
135+
<Content Include="admin\app\controllers\pings.js" />
136+
<Content Include="admin\app\controllers\blogRoll.js" />
137+
<Content Include="admin\app\controllers\files.js" />
138+
<Content Include="admin\app\controllers\postEditor.js" />
139+
<Content Include="admin\app\data-service.js" />
140+
<Content Include="admin\app\controllers\tools.js" />
141141
<Content Include="admin\editors\bootstrap-wysiwyg\bootstrap-wysiwyg.js" />
142142
<Content Include="admin\editors\bootstrap-wysiwyg\editor.js" />
143143
<Content Include="admin\editors\bootstrap-wysiwyg\jquery.hotkeys.js" />
@@ -1533,18 +1533,18 @@
15331533
<Content Include="Account\password-retrieval.aspx" />
15341534
<Content Include="Account\register.aspx" />
15351535
<Content Include="admin\app.js" />
1536-
<Content Include="admin\controllers\blogs.js" />
1537-
<Content Include="admin\controllers\categories.js" />
1538-
<Content Include="admin\controllers\comments.js" />
1539-
<Content Include="admin\controllers\common.js" />
1540-
<Content Include="admin\controllers\dashboard.js" />
1541-
<Content Include="admin\controllers\pages.js" />
1542-
<Content Include="admin\controllers\posts.js" />
1543-
<Content Include="admin\controllers\profile.js" />
1544-
<Content Include="admin\controllers\roles.js" />
1545-
<Content Include="admin\controllers\settings.js" />
1546-
<Content Include="admin\controllers\tags.js" />
1547-
<Content Include="admin\controllers\users.js" />
1536+
<Content Include="admin\app\controllers\blogList.js" />
1537+
<Content Include="admin\app\controllers\categories.js" />
1538+
<Content Include="admin\app\controllers\commentList.js" />
1539+
<Content Include="admin\app\controllers\common.js" />
1540+
<Content Include="admin\app\controllers\dashboard.js" />
1541+
<Content Include="admin\app\controllers\pages.js" />
1542+
<Content Include="admin\app\controllers\posts.js" />
1543+
<Content Include="admin\app\controllers\profile.js" />
1544+
<Content Include="admin\app\controllers\roles.js" />
1545+
<Content Include="admin\app\controllers\settings.js" />
1546+
<Content Include="admin\app\controllers\tags.js" />
1547+
<Content Include="admin\app\controllers\users.js" />
15481548
<Content Include="admin\Extensions\Settings.ascx" />
15491549
<Content Include="admin\Extensions\Settings.aspx" />
15501550
<Content Include="admin\menu.ascx" />
@@ -1624,12 +1624,10 @@
16241624
<Content Include="bin\System.Web.WebPages.Razor.dll" />
16251625
<Content Include="bin\WebGrease.dll" />
16261626
<Content Include="contact.aspx" />
1627-
<Content Include="Content\app.css" />
16281627
<Content Include="Content\Auto\Global.css" />
1629-
<Content Include="Content\editor.css" />
16301628
<Content Include="Content\font-awesome.css" />
16311629
<Content Include="Content\font-awesome.min.css" />
1632-
<Content Include="Content\images\blog\active-filterbar.png" />
1630+
<Content Include="admin\themes\standard\img\active-filterbar.png" />
16331631
<Content Include="Content\images\blog\avatars\blank.png" />
16341632
<Content Include="Content\images\blog\avatars\identicon.png" />
16351633
<Content Include="Content\images\blog\avatars\mm.png" />
@@ -1670,8 +1668,6 @@
16701668
<Content Include="Scripts\Auto\04-jquery-jtemplates.js" />
16711669
<Content Include="Scripts\Auto\05-json2.min.js" />
16721670
<Content Include="Scripts\Auto\blog.js" />
1673-
<Content Include="Scripts\jquery-1.8.2.js" />
1674-
<Content Include="Scripts\jquery-1.8.2.min.js" />
16751671
<Content Include="Scripts\jquery-jtemplates.js" />
16761672
<Content Include="Scripts\jquery-jtemplates.min.js" />
16771673
<Content Include="Scripts\jquery.form.js" />

0 commit comments

Comments
 (0)