From 503a1bad745103fd12aa67f5f8b268d16478c4f2 Mon Sep 17 00:00:00 2001 From: Zdravko Georgiev Date: Wed, 26 Aug 2015 18:52:15 +0300 Subject: [PATCH] Added About page route, view and controller. Removed links to external sites from main menu --- .../Client/Showcase.Client.App/Scripts/_references.js | 3 +-- .../Showcase.Client.App/Showcase.Client.App.csproj | 2 ++ .../app/about-page/about-page-controller.js | 11 +++++++++++ .../app/about-page/about-view.html | 10 ++++++++++ Source/Client/Showcase.Client.App/app/app.js | 5 +++++ .../app/common/main-menu-directive.html | 7 +------ 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 Source/Client/Showcase.Client.App/app/about-page/about-page-controller.js create mode 100644 Source/Client/Showcase.Client.App/app/about-page/about-view.html diff --git a/Source/Client/Showcase.Client.App/Scripts/_references.js b/Source/Client/Showcase.Client.App/Scripts/_references.js index 17e5f1f..d01799d 100644 --- a/Source/Client/Showcase.Client.App/Scripts/_references.js +++ b/Source/Client/Showcase.Client.App/Scripts/_references.js @@ -155,6 +155,5 @@ /// /// /// -/// -/// +/// diff --git a/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj b/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj index 9f3b325..3007fa8 100644 --- a/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj +++ b/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj @@ -124,6 +124,8 @@ + + diff --git a/Source/Client/Showcase.Client.App/app/about-page/about-page-controller.js b/Source/Client/Showcase.Client.App/app/about-page/about-page-controller.js new file mode 100644 index 0000000..e4c3532 --- /dev/null +++ b/Source/Client/Showcase.Client.App/app/about-page/about-page-controller.js @@ -0,0 +1,11 @@ +(function () { + 'use strict'; + + var aboutPageController = function addProjectController() { + + }; + + angular + .module('showcaseSystem.controllers') + .controller('AboutPageController', [aboutPageController]); +}()); \ No newline at end of file diff --git a/Source/Client/Showcase.Client.App/app/about-page/about-view.html b/Source/Client/Showcase.Client.App/app/about-page/about-view.html new file mode 100644 index 0000000..cd65c60 --- /dev/null +++ b/Source/Client/Showcase.Client.App/app/about-page/about-view.html @@ -0,0 +1,10 @@ +
+
+
+
+

About us

+ +
+
+
+
\ No newline at end of file diff --git a/Source/Client/Showcase.Client.App/app/app.js b/Source/Client/Showcase.Client.App/app/app.js index b37d2f6..e68b9ec 100644 --- a/Source/Client/Showcase.Client.App/app/app.js +++ b/Source/Client/Showcase.Client.App/app/app.js @@ -27,6 +27,11 @@ controllerAs: CONTROLLER_VIEW_MODEL_NAME, resolve: routeResolveChecks.addProject }) + .when('/about', { + templateUrl: 'about-page/about-view.html', + controller: 'AboutPageController', + controllerAs: CONTROLLER_VIEW_MODEL_NAME + }) .when('/statistics', { templateUrl: 'statistics-page/statistics-view.html', controller: 'StatisticsController', diff --git a/Source/Client/Showcase.Client.App/app/common/main-menu-directive.html b/Source/Client/Showcase.Client.App/app/common/main-menu-directive.html index 6490f79..43cca07 100644 --- a/Source/Client/Showcase.Client.App/app/common/main-menu-directive.html +++ b/Source/Client/Showcase.Client.App/app/common/main-menu-directive.html @@ -23,15 +23,10 @@
  • - + INFO about us
  • -
  • - - STUDENT SYSTEM telerik academy - -
  • \ No newline at end of file