Skip to content

Commit 757cc6d

Browse files
rxturrxtur
committed
Completed app restructuring - moves, renaming etc.
1 parent b96c720 commit 757cc6d

Some content is hidden

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

48 files changed

+76
-439
lines changed

‎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.3.7")]
22+
[assembly: AssemblyVersion("3.1.3.8")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

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

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,16 @@ static void RegisterBundles(BundleCollection bundles)
117117
.Include("~/Scripts/Q.js")
118118
.Include("~/Scripts/angular.min.js")
119119
.Include("~/Scripts/angular-route.min.js")
120-
.Include("~/Scripts/angular-sanitize.min.js")
121-
.Include("~/admin/app.js")
120+
.Include("~/Scripts/angular-sanitize.min.js")
121+
122+
.Include("~/admin/app/app.js")
122123
.Include("~/admin/app/listpager.js")
123124
.Include("~/admin/app/grid-helpers.js")
124125
.Include("~/admin/app/data-service.js")
126+
.Include("~/admin/app/fileManager.js")
127+
.Include("~/admin/app/common.js")
125128

126-
.Include("~/admin/app/controllers/dashboard.js")
129+
.Include("~/admin/app/dashboard/dashboardController.js")
127130

128131
.Include("~/admin/app/content/blogs/blogController.js")
129132
.Include("~/admin/app/content/posts/postController.js")
@@ -133,25 +136,17 @@ static void RegisterBundles(BundleCollection bundles)
133136
.Include("~/admin/app/content/comments/commentController.js")
134137
.Include("~/admin/app/content/comments/commentFilters.js")
135138

139+
.Include("~/admin/app/custom/plugins/pluginController.js")
140+
.Include("~/admin/app/custom/themes/themeController.js")
141+
136142
.Include("~/admin/app/security/users/userController.js")
137143
.Include("~/admin/app/security/roles/roleController.js")
138144
.Include("~/admin/app/security/profile/profileController.js")
139145

140-
.Include("~/admin/app/controllers/help.js")
141-
.Include("~/admin/app/controllers/about.js")
142-
.Include("~/admin/app/controllers/fileManager.js")
143-
144-
145-
146-
.Include("~/admin/app/controllers/settings.js")
147-
.Include("~/admin/app/controllers/tools.js")
148-
149-
.Include("~/admin/app/controllers/blogRoll.js")
150-
.Include("~/admin/app/controllers/pings.js")
151-
.Include("~/admin/app/custom/plugins/pluginsController.js")
152-
.Include("~/admin/app/custom/themes/themesController.js")
153-
.Include("~/admin/app/controllers/package.js")
154-
.Include("~/admin/app/controllers/common.js")
146+
.Include("~/admin/app/settings/settingController.js")
147+
.Include("~/admin/app/settings/tools/toolController.js")
148+
.Include("~/admin/app/settings/controls/blogrollController.js")
149+
.Include("~/admin/app/settings/controls/pingController.js")
155150
);
156151

157152
bundles.Add(
@@ -170,10 +165,10 @@ static void RegisterBundles(BundleCollection bundles)
170165
.Include("~/admin/app.js")
171166
.Include("~/admin/app/grid-helpers.js")
172167
.Include("~/admin/app/editor-helpers.js")
173-
.Include("~/admin/app/controllers/postEditor.js")
174-
.Include("~/admin/app/controllers/pageEditor.js")
175-
.Include("~/admin/app/controllers/fileManager.js")
176-
.Include("~/admin/app/controllers/common.js")
168+
.Include("~/admin/app/postEditor.js")
169+
.Include("~/admin/app/pageEditor.js")
170+
.Include("~/admin/app/fileManager.js")
171+
.Include("~/admin/app/common.js")
177172
.Include("~/admin/app/data-service.js")
178173
);
179174

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

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,20 @@
119119
</ItemGroup>
120120
<ItemGroup>
121121
<Content Include="Account\account.master" />
122-
<Content Include="admin\app\content\blogs\blogList.html" />
123-
<Content Include="admin\app\content\categories\categoryList.html" />
124-
<Content Include="admin\app\content\comments\commentList.html" />
122+
<Content Include="admin\app\content\blogs\blogView.html" />
123+
<Content Include="admin\app\content\categories\categoryView.html" />
124+
<Content Include="admin\app\content\comments\commentView.html" />
125125
<Content Include="admin\app\content\comments\commentFilters.html" />
126-
<Content Include="admin\app\content\pages\pageList.html" />
127-
<Content Include="admin\app\content\posts\postList.html" />
128-
<Content Include="admin\app\content\tags\tagList.html" />
129-
<Content Include="admin\app\custom\plugins\pluginsController.js" />
130-
<Content Include="admin\app\custom\plugins\pluginsGallery.html" />
131-
<Content Include="admin\app\custom\plugins\pluginsList.html" />
132-
<Content Include="admin\app\custom\themes\themesController.js" />
133-
<Content Include="admin\app\custom\themes\themesGallery.html" />
134-
<Content Include="admin\app\custom\themes\themesList.html" />
135-
<Content Include="admin\app\custom\widgets\widgetsList.html" />
126+
<Content Include="admin\app\content\pages\pageView.html" />
127+
<Content Include="admin\app\content\posts\postView.html" />
128+
<Content Include="admin\app\content\tags\tagView.html" />
129+
<Content Include="admin\app\custom\plugins\pluginController.js" />
130+
<Content Include="admin\app\custom\plugins\pluginGallery.html" />
131+
<Content Include="admin\app\custom\plugins\pluginView.html" />
132+
<Content Include="admin\app\custom\themes\themeController.js" />
133+
<Content Include="admin\app\custom\themes\themeGallery.html" />
134+
<Content Include="admin\app\custom\themes\themeView.html" />
135+
<Content Include="admin\app\custom\widgets\widgetView.html" />
136136
<Content Include="admin\themes\standard\css\01.main.css" />
137137
<Content Include="admin\themes\standard\css\02.nav.css" />
138138
<Content Include="admin\themes\standard\css\03.header.css" />
@@ -153,20 +153,17 @@
153153
<Content Include="Content\images\blog\icon-user.svg" />
154154
<Content Include="Account\Logout.cshtml" />
155155
<Content Include="Account\Web.Config" />
156-
<Content Include="admin\app\controllers\about.js" />
157156
<Content Include="admin\app\grid-helpers.js" />
158157
<Content Include="admin\app\content\comments\commentFilters.js" />
159158
<Content Include="admin\app\editor-helpers.js" />
160-
<Content Include="admin\app\controllers\help.js" />
161159
<Content Include="admin\app\listpager.js" />
162-
<Content Include="admin\app\controllers\package.js" />
163-
<Content Include="admin\app\controllers\pageEditor.js" />
164-
<Content Include="admin\app\controllers\pings.js" />
165-
<Content Include="admin\app\controllers\blogRoll.js" />
166-
<Content Include="admin\app\controllers\fileManager.js" />
167-
<Content Include="admin\app\controllers\postEditor.js" />
160+
<Content Include="admin\app\pageEditor.js" />
161+
<Content Include="admin\app\settings\controls\pingController.js" />
162+
<Content Include="admin\app\settings\controls\blogrollController.js" />
163+
<Content Include="admin\app\fileManager.js" />
164+
<Content Include="admin\app\postEditor.js" />
168165
<Content Include="admin\app\data-service.js" />
169-
<Content Include="admin\app\controllers\tools.js" />
166+
<Content Include="admin\app\settings\tools\toolController.js" />
170167
<Content Include="admin\editors\bootstrap-wysiwyg\bootstrap-wysiwyg.js" />
171168
<Content Include="admin\editors\bootstrap-wysiwyg\editor.js" />
172169
<Content Include="admin\editors\bootstrap-wysiwyg\jquery.hotkeys.js" />
@@ -265,16 +262,11 @@
265262
<Content Include="admin\index.cshtml" />
266263
<Content Include="admin\themes\standard\css\admin.css" />
267264
<Content Include="admin\about.cshtml" />
268-
<Content Include="admin\views\settings\controls.html" />
269-
<Content Include="admin\views\settings\controls\blogroll.html" />
270-
<Content Include="admin\views\settings\controls\pings.html" />
271-
<Content Include="admin\views\settings\comments.html" />
272-
<Content Include="admin\views\settings\theme.html" />
273-
<Content Include="admin\views\settings\tools\check.html" />
274-
<Content Include="admin\views\shared\_editnote.html" />
275-
<Content Include="admin\views\shared\_addnote.html" />
276-
<Content Include="admin\views\shared\_review.html" />
277-
<Content Include="admin\views\help\index.html" />
265+
<Content Include="admin\app\settings\controlView.html" />
266+
<Content Include="admin\app\settings\controls\blogrollView.html" />
267+
<Content Include="admin\app\settings\controls\pingView.html" />
268+
<Content Include="admin\app\settings\commentView.html" />
269+
<Content Include="admin\app\settings\tools\checkView.html" />
278270
<Content Include="admin\Web.Config" />
279271
<Content Include="admin\editors\bootstrap-wysiwyg\editor.cshtml" />
280272
<Content Include="admin\editors\summernote\editor.cshtml" />
@@ -1552,27 +1544,27 @@
15521544
<Content Include="Account\login.aspx" />
15531545
<Content Include="Account\password-retrieval.aspx" />
15541546
<Content Include="Account\register.aspx" />
1555-
<Content Include="admin\app.js" />
1547+
<Content Include="admin\app\app.js" />
15561548
<Content Include="admin\app\content\blogs\blogController.js" />
15571549
<Content Include="admin\app\content\categories\categoryController.js" />
15581550
<Content Include="admin\app\content\comments\commentController.js" />
1559-
<Content Include="admin\app\controllers\common.js" />
1560-
<Content Include="admin\app\controllers\dashboard.js" />
1551+
<Content Include="admin\app\common.js" />
1552+
<Content Include="admin\app\dashboard\dashboardController.js" />
15611553
<Content Include="admin\app\content\pages\pageController.js" />
15621554
<Content Include="admin\app\content\posts\postController.js" />
15631555
<Content Include="admin\app\security\profile\profileController.js" />
15641556
<Content Include="admin\app\security\roles\roleController.js" />
1565-
<Content Include="admin\app\controllers\settings.js" />
1557+
<Content Include="admin\app\settings\settingController.js" />
15661558
<Content Include="admin\app\content\tags\tagController.js" />
15671559
<Content Include="admin\app\security\users\userController.js" />
15681560
<Content Include="admin\Extensions\Settings.ascx" />
15691561
<Content Include="admin\Extensions\Settings.aspx" />
15701562
<Content Include="admin\menu.ascx" />
1571-
<Content Include="admin\views\dashboard.html" />
1572-
<Content Include="admin\views\settings\advanced.html" />
1573-
<Content Include="admin\views\settings\basic.html" />
1574-
<Content Include="admin\views\settings\email.html" />
1575-
<Content Include="admin\views\settings\feed.html" />
1563+
<Content Include="admin\app\dashboard\dashboardView.html" />
1564+
<Content Include="admin\app\settings\advancedView.html" />
1565+
<Content Include="admin\app\settings\basicView.html" />
1566+
<Content Include="admin\app\settings\emailView.html" />
1567+
<Content Include="admin\app\settings\feedView.html" />
15761568
<Content Include="admin\app\security\users\userView.html" />
15771569
<Content Include="admin\app\security\profile\profileView.html" />
15781570
<Content Include="admin\app\security\roles\roleView.html" />

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

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,35 @@
33

44
var config = ["$routeProvider", function ($routeProvider) {
55
$routeProvider
6-
.when("/", { templateUrl: "views/dashboard.html" })
6+
.when("/", { templateUrl: "app/dashboard/dashboardView.html" })
77

8-
.when("/content/posts", { templateUrl: "app/content/posts/postList.html" })
9-
.when("/content/blogs", { templateUrl: "app/content/blogs/blogList.html" })
10-
.when("/content/comments", { templateUrl: "app/content/comments/commentList.html" })
8+
.when("/content/posts", { templateUrl: "app/content/posts/postView.html" })
9+
.when("/content/blogs", { templateUrl: "app/content/blogs/blogView.html" })
10+
.when("/content/comments", { templateUrl: "app/content/comments/commentView.html" })
1111
.when("/content/comments/filters", { templateUrl: "app/content/comments/commentFilters.html" })
12-
.when("/content/pages", { templateUrl: "app/content/pages/pageList.html" })
13-
.when("/content/categories", { templateUrl: "app/content/categories/categoryList.html" })
14-
.when("/content/tags", { templateUrl: "app/content/tags/tagList.html" })
12+
.when("/content/pages", { templateUrl: "app/content/pages/pageView.html" })
13+
.when("/content/categories", { templateUrl: "app/content/categories/categoryView.html" })
14+
.when("/content/tags", { templateUrl: "app/content/tags/tagView.html" })
1515

16-
.when("/custom/plugins", { templateUrl: "app/custom/plugins/pluginsList.html" })
17-
.when("/custom/plugins/gallery", { templateUrl: "app/custom/plugins/pluginsGallery.html" })
18-
.when("/custom/themes", { templateUrl: "app/custom/themes/themesList.html" })
19-
.when("/custom/themes/gallery", { templateUrl: "app/custom/themes/themesGallery.html" })
20-
.when("/custom/widgets", { templateUrl: "app/custom/widgets/widgetsList.html" })
16+
.when("/custom/plugins", { templateUrl: "app/custom/plugins/pluginView.html" })
17+
.when("/custom/plugins/gallery", { templateUrl: "app/custom/plugins/pluginGallery.html" })
18+
.when("/custom/themes", { templateUrl: "app/custom/themes/themeView.html" })
19+
.when("/custom/themes/gallery", { templateUrl: "app/custom/themes/themeGallery.html" })
20+
.when("/custom/widgets", { templateUrl: "app/custom/widgets/widgetView.html" })
2121

2222
.when("/security/profile", { templateUrl: "app/security/profile/profileView.html" })
2323
.when("/security/roles", { templateUrl: "app/security/roles/roleView.html" })
2424
.when("/security/users", { templateUrl: "app/security/users/userView.html" })
2525

26-
.when("/settings/basic", { templateUrl: "views/settings/basic.html" })
27-
.when("/settings/feed", { templateUrl: "views/settings/feed.html" })
28-
.when("/settings/email", { templateUrl: "views/settings/email.html" })
29-
.when("/settings/comments", { templateUrl: "views/settings/comments.html" })
30-
.when("/settings/controls", { templateUrl: "views/settings/controls.html" })
31-
.when("/settings/advanced", { templateUrl: "views/settings/advanced.html" })
32-
33-
.when("/settings/theme", { templateUrl: "views/settings/theme.html" })
34-
35-
.when("/settings/controls/blogroll", { templateUrl: "views/settings/controls/blogroll.html" })
36-
.when("/settings/controls/pings", { templateUrl: "views/settings/controls/pings.html" })
37-
38-
.when("/settings/tools", { templateUrl: "views/settings/tools/check.html" })
39-
40-
.when("/help", { templateUrl: "views/help/index.html" })
41-
.when("/about", { templateUrl: "views/about/index.html" })
26+
.when("/settings/basic", { templateUrl: "app/settings/basicView.html" })
27+
.when("/settings/feed", { templateUrl: "app/settings/feedView.html" })
28+
.when("/settings/email", { templateUrl: "app/settings/emailView.html" })
29+
.when("/settings/comments", { templateUrl: "app/settings/commentView.html" })
30+
.when("/settings/controls", { templateUrl: "app/settings/controlView.html" })
31+
.when("/settings/advanced", { templateUrl: "app/settings/advancedView.html" })
32+
.when("/settings/controls/blogroll", { templateUrl: "app/settings/controls/blogrollView.html" })
33+
.when("/settings/controls/pings", { templateUrl: "app/settings/controls/pingView.html" })
34+
.when("/settings/tools", { templateUrl: "app/settings/tools/checkView.html" })
4235

4336
.otherwise({ redirectTo: "/" });
4437
}];

‎BlogEngine/BlogEngine.NET/admin/app/controllers/common.js renamed to ‎BlogEngine/BlogEngine.NET/admin/app/common.js

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/blogs/blogView.html

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/categories/categoryController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
.success(function (data) {
3030
angular.copy(data, $scope.items);
3131
gridInit($scope, $filter);
32-
rowSpinOff($scope.items);
32+
spinOff();
3333
})
3434
.error(function () {
3535
toastr.error($rootScope.lbl.errorLoadingCategories);

‎BlogEngine/BlogEngine.NET/admin/app/content/categories/categoryList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/categories/categoryView.html

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/comments/commentList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/comments/commentView.html

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/pages/pageList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/pages/pageView.html

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/posts/postList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/posts/postView.html

File renamed without changes.

‎BlogEngine/BlogEngine.NET/admin/app/content/tags/tagController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
.success(function (data) {
1919
angular.copy(data, $scope.items);
2020
gridInit($scope, $filter);
21-
rowSpinOff($scope.items);
21+
spinOff();
2222
})
2323
.error(function (data) {
2424
toastr.success($rootScope.lbl.errorGettingTags);

‎BlogEngine/BlogEngine.NET/admin/app/content/tags/tagList.html renamed to ‎BlogEngine/BlogEngine.NET/admin/app/content/tags/tagView.html

File renamed without changes.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)