Skip to content

Commit c90ba30

Browse files
rxturrxtur
committed
Plugin/themes pages refactoring (still in progress)
1 parent f7281f1 commit c90ba30

10 files changed

Lines changed: 415 additions & 337 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ static void RegisterBundles(BundleCollection bundles)
140140
.Include("~/admin/app/controllers/commentFilters.js")
141141
.Include("~/admin/app/controllers/blogRoll.js")
142142
.Include("~/admin/app/controllers/pings.js")
143-
.Include("~/admin/app/controllers/custom.js")
143+
.Include("~/admin/app/controllers/customThemes.js")
144+
.Include("~/admin/app/controllers/customPlugins.js")
144145
.Include("~/admin/app/controllers/package.js")
145146
.Include("~/admin/app/controllers/common.js")
146-
//.Include("~/admin/editors/summernote/summernote.js")
147147
);
148148

149149
bundles.Add(

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
</ItemGroup>
120120
<ItemGroup>
121121
<Content Include="Account\account.master" />
122+
<Content Include="admin\app\controllers\customPlugins.js" />
123+
<Content Include="admin\app\controllers\customThemes.js" />
122124
<Content Include="admin\themes\standard\css\01.main.css" />
123125
<Content Include="admin\themes\standard\css\02.nav.css" />
124126
<Content Include="admin\themes\standard\css\03.header.css" />
@@ -133,6 +135,10 @@
133135
<Content Include="admin\themes\standard\css\12.comments.css" />
134136
<Content Include="admin\themes\standard\img\logo-sidebar.png" />
135137
<Content Include="admin\themes\standard\img\profile.png" />
138+
<Content Include="admin\views\custom\plugins\gallery.html" />
139+
<Content Include="admin\views\custom\plugins\local.html" />
140+
<Content Include="admin\views\custom\themes\gallery.html" />
141+
<Content Include="admin\views\custom\themes\local.html" />
136142
<Content Include="App_Data\posts\f39c3289-e861-48f7-a4b7-edaaffe6f6dc.xml" />
137143
<Content Include="Content\images\blog\icon-left.svg" />
138144
<Content Include="Content\images\blog\icon-pass.svg" />
@@ -145,7 +151,6 @@
145151
<Content Include="admin\app\editor-helpers.js" />
146152
<Content Include="admin\app\controllers\help.js" />
147153
<Content Include="admin\app\listpager.js" />
148-
<Content Include="admin\app\controllers\custom.js" />
149154
<Content Include="admin\app\controllers\package.js" />
150155
<Content Include="admin\app\controllers\pageEditor.js" />
151156
<Content Include="admin\app\controllers\pings.js" />
@@ -254,8 +259,6 @@
254259
<Content Include="admin\views\content\blogs.html" />
255260
<Content Include="admin\about.cshtml" />
256261
<Content Include="admin\views\content\filters.html" />
257-
<Content Include="admin\views\custom\gallery.html" />
258-
<Content Include="admin\views\custom\package.html" />
259262
<Content Include="admin\views\settings\controls.html" />
260263
<Content Include="admin\views\settings\controls\blogroll.html" />
261264
<Content Include="admin\views\settings\controls\pings.html" />
@@ -1564,8 +1567,6 @@
15641567
<Content Include="admin\views\content\pages.html" />
15651568
<Content Include="admin\views\content\posts.html" />
15661569
<Content Include="admin\views\content\tags.html" />
1567-
<Content Include="admin\views\custom\plugins.html" />
1568-
<Content Include="admin\views\custom\themes.html" />
15691570
<Content Include="admin\views\custom\widgets.html" />
15701571
<Content Include="admin\views\dashboard.html" />
15711572
<Content Include="admin\views\settings\advanced.html" />
@@ -2234,6 +2235,7 @@
22342235
</Compile>
22352236
<Compile Include="Custom\Themes\Standard-minimal\site.master.cs">
22362237
<DependentUpon>site.master</DependentUpon>
2238+
<SubType>ASPXCodeBehind</SubType>
22372239
</Compile>
22382240
<Compile Include="Custom\Themes\Standard-minimal\site.master.designer.cs">
22392241
<DependentUpon>site.master</DependentUpon>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
.when("/content/tags", { templateUrl: "views/content/tags.html" })
1414
.when("/content/comments/filters", { templateUrl: "views/content/filters.html" })
1515

16-
.when("/custom/plugins", { templateUrl: "views/custom/plugins.html" })
17-
.when("/custom/themes", { templateUrl: "views/custom/themes.html" })
16+
.when("/custom/plugins", { templateUrl: "views/custom/plugins/local.html" })
17+
.when("/custom/plugins/gallery", { templateUrl: "views/custom/plugins/gallery.html" })
18+
.when("/custom/themes", { templateUrl: "views/custom/themes/local.html" })
19+
.when("/custom/themes/gallery", { templateUrl: "views/custom/themes/gallery.html" })
1820
.when("/custom/widgets", { templateUrl: "views/custom/widgets.html" })
19-
.when("/custom/gallery", { templateUrl: "views/custom/gallery.html" })
20-
.when("/custom/package", { templateUrl: "views/custom/package.html" })
2121

2222
.when("/security/profile", { templateUrl: "views/security/profile.html" })
2323
.when("/security/roles", { templateUrl: "views/security/roles.html" })

0 commit comments

Comments
 (0)