Skip to content

Commit b96c720

Browse files
rxturrxtur
committed
Security views and scripts moved under admin/app
1 parent 16d5633 commit b96c720

9 files changed

Lines changed: 17 additions & 13 deletions

File tree

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,16 @@ static void RegisterBundles(BundleCollection bundles)
133133
.Include("~/admin/app/content/comments/commentController.js")
134134
.Include("~/admin/app/content/comments/commentFilters.js")
135135

136+
.Include("~/admin/app/security/users/userController.js")
137+
.Include("~/admin/app/security/roles/roleController.js")
138+
.Include("~/admin/app/security/profile/profileController.js")
139+
136140
.Include("~/admin/app/controllers/help.js")
137141
.Include("~/admin/app/controllers/about.js")
138-
.Include("~/admin/app/controllers/fileManager.js")
139-
.Include("~/admin/app/controllers/users.js")
140-
.Include("~/admin/app/controllers/roles.js")
141-
.Include("~/admin/app/controllers/profile.js")
142+
.Include("~/admin/app/controllers/fileManager.js")
143+
144+
145+
142146
.Include("~/admin/app/controllers/settings.js")
143147
.Include("~/admin/app/controllers/tools.js")
144148

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,11 +1560,11 @@
15601560
<Content Include="admin\app\controllers\dashboard.js" />
15611561
<Content Include="admin\app\content\pages\pageController.js" />
15621562
<Content Include="admin\app\content\posts\postController.js" />
1563-
<Content Include="admin\app\controllers\profile.js" />
1564-
<Content Include="admin\app\controllers\roles.js" />
1563+
<Content Include="admin\app\security\profile\profileController.js" />
1564+
<Content Include="admin\app\security\roles\roleController.js" />
15651565
<Content Include="admin\app\controllers\settings.js" />
15661566
<Content Include="admin\app\content\tags\tagController.js" />
1567-
<Content Include="admin\app\controllers\users.js" />
1567+
<Content Include="admin\app\security\users\userController.js" />
15681568
<Content Include="admin\Extensions\Settings.ascx" />
15691569
<Content Include="admin\Extensions\Settings.aspx" />
15701570
<Content Include="admin\menu.ascx" />
@@ -1573,9 +1573,9 @@
15731573
<Content Include="admin\views\settings\basic.html" />
15741574
<Content Include="admin\views\settings\email.html" />
15751575
<Content Include="admin\views\settings\feed.html" />
1576-
<Content Include="admin\views\security\users.html" />
1577-
<Content Include="admin\views\security\profile.html" />
1578-
<Content Include="admin\views\security\roles.html" />
1576+
<Content Include="admin\app\security\users\userView.html" />
1577+
<Content Include="admin\app\security\profile\profileView.html" />
1578+
<Content Include="admin\app\security\roles\roleView.html" />
15791579
<Content Include="admin\WidgetEditor.aspx" />
15801580
<Content Include="App_Data\blogroll.xml" />
15811581
<Content Include="App_Data\blogs.xml" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
.when("/custom/themes/gallery", { templateUrl: "app/custom/themes/themesGallery.html" })
2020
.when("/custom/widgets", { templateUrl: "app/custom/widgets/widgetsList.html" })
2121

22-
.when("/security/profile", { templateUrl: "views/security/profile.html" })
23-
.when("/security/roles", { templateUrl: "views/security/roles.html" })
24-
.when("/security/users", { templateUrl: "views/security/users.html" })
22+
.when("/security/profile", { templateUrl: "app/security/profile/profileView.html" })
23+
.when("/security/roles", { templateUrl: "app/security/roles/roleView.html" })
24+
.when("/security/users", { templateUrl: "app/security/users/userView.html" })
2525

2626
.when("/settings/basic", { templateUrl: "views/settings/basic.html" })
2727
.when("/settings/feed", { templateUrl: "views/settings/feed.html" })

BlogEngine/BlogEngine.NET/admin/app/controllers/profile.js renamed to BlogEngine/BlogEngine.NET/admin/app/security/profile/profileController.js

File renamed without changes.

BlogEngine/BlogEngine.NET/admin/views/security/profile.html renamed to BlogEngine/BlogEngine.NET/admin/app/security/profile/profileView.html

File renamed without changes.

BlogEngine/BlogEngine.NET/admin/app/controllers/roles.js renamed to BlogEngine/BlogEngine.NET/admin/app/security/roles/roleController.js

File renamed without changes.

BlogEngine/BlogEngine.NET/admin/views/security/roles.html renamed to BlogEngine/BlogEngine.NET/admin/app/security/roles/roleView.html

File renamed without changes.

BlogEngine/BlogEngine.NET/admin/app/controllers/users.js renamed to BlogEngine/BlogEngine.NET/admin/app/security/users/userController.js

File renamed without changes.

BlogEngine/BlogEngine.NET/admin/views/security/users.html renamed to BlogEngine/BlogEngine.NET/admin/app/security/users/userView.html

File renamed without changes.

0 commit comments

Comments
 (0)