Skip to content

Commit

Permalink
Help and About pages
Browse files Browse the repository at this point in the history
- set up "help" and "about" pages in the admin section
- removed Quixote library from the "lib"
  • Loading branch information
rxtur committed May 25, 2015
1 parent cdc0ad2 commit 466d486
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 1,481 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ static void RegisterBundles(BundleCollection bundles)
.Include("~/admin/app.js")
.Include("~/admin/controllers/dashboard.js")
.Include("~/admin/controllers/blogs.js")
.Include("~/admin/controllers/help.js")
.Include("~/admin/controllers/about.js")
.Include("~/admin/controllers/posts.js")
.Include("~/admin/controllers/listpager.js")
.Include("~/admin/controllers/pages.js")
Expand Down
4 changes: 3 additions & 1 deletion BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@
<Content Include="Account\Logout.cshtml" />
<Content Include="Account\Web.Config" />
<Content Include="admin\admin.master" />
<Content Include="admin\controllers\about.js" />
<Content Include="admin\controllers\commentfilters.js" />
<Content Include="admin\controllers\help.js" />
<Content Include="admin\controllers\listpager.js" />
<Content Include="admin\controllers\pings.js" />
<Content Include="admin\controllers\blogroll.js" />
Expand Down Expand Up @@ -251,7 +253,7 @@
<Content Include="admin\views\shared\_settingcomments.html" />
<Content Include="admin\views\shared\_controls.html" />
<Content Include="admin\views\shared\_filestable.html" />
<Content Include="admin\views\helps\index.html" />
<Content Include="admin\views\help\index.html" />
<Content Include="admin\Web.Config" />
<Content Include="admin\editor\_filemgr.cshtml" />
<Content Include="admin\editor\_uploadbtns.cshtml" />
Expand Down
4 changes: 4 additions & 0 deletions BlogEngine/BlogEngine.NET/admin/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
.when("/settings/tools", { templateUrl: "views/settings/tools/check.html" })
.when("/settings/tools/export", { templateUrl: "views/settings/tools/export.html" })
.when("/settings/tools/import", { templateUrl: "views/settings/tools/import.html" })

.when("/help", { templateUrl: "views/help/index.html" })
.when("/about", { templateUrl: "views/about/index.html" })

.otherwise({ redirectTo: "/" });
}];
app.config(config);
Expand Down
5 changes: 5 additions & 0 deletions BlogEngine/BlogEngine.NET/admin/controllers/about.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

angular.module('blogAdmin').controller('AboutController', ["$rootScope", "$scope", "$filter", "dataService", function ($rootScope, $scope, $filter, dataService) {
$scope.items = [];

}]);
5 changes: 5 additions & 0 deletions BlogEngine/BlogEngine.NET/admin/controllers/help.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

angular.module('blogAdmin').controller('HelpController', ["$rootScope", "$scope", "$filter", "dataService", function ($rootScope, $scope, $filter, dataService) {
$scope.items = [];

}]);
4 changes: 2 additions & 2 deletions BlogEngine/BlogEngine.NET/admin/index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
<li data-ng-class="{ active: isActive('/settings/tools')}"><a class="ng-binding" href="#/settings/tools">Tools</a></li>
</ul>
</li>
<li id="mu-help"><a href="#/helps"><i class="fa fa-question-circle"></i>Help Center</a></li>
<li id="mu-About"><a href="#/about"><i class="fa fa-question-circle"></i>BlogEngine.NET 4.0</a></li>
<li id="mu-help"><a href="#/help"><i class="fa fa-question-circle"></i>Help Center</a></li>
<li id="mu-about"><a href="#/about"><i class="fa fa-question-circle"></i>BlogEngine.NET 4.0</a></li>
</ul>
</div>
<div class="content">
Expand Down
6 changes: 4 additions & 2 deletions BlogEngine/BlogEngine.NET/admin/views/about/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<div class="admin-views-about" data-ng-controller="">
<div class="admin-views-about" ng-controller="AboutController">
<div class="page-header clearfix">
<h2 class="page-title pull-left">About BlogEngine.NET 4.0</h2>
</div>
Hello
<div class="content-inner">
Content about.
</div>
</div>
8 changes: 8 additions & 0 deletions BlogEngine/BlogEngine.NET/admin/views/help/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div class="admin-views-helps" ng-controller="HelpController">
<div class="page-header clearfix">
<h2 class="page-title pull-left">Help Center</h2>
</div>
<div class="content-inner">
Help content
</div>
</div>
6 changes: 0 additions & 6 deletions BlogEngine/BlogEngine.NET/admin/views/helps/index.html

This file was deleted.

11 changes: 0 additions & 11 deletions lib/Quixote/LICENSE.txt

This file was deleted.

20 changes: 0 additions & 20 deletions lib/Quixote/Quixote.solution

This file was deleted.

83 changes: 0 additions & 83 deletions lib/Quixote/Quixote/Examples/Basics.cshtml

This file was deleted.

Loading

0 comments on commit 466d486

Please sign in to comment.