Added About page route, view and controller. Removed links to externa…

…l sites from main menu
TelerikAcademy · Aug 26, 2015 · 503a1ba · 503a1ba
1 parent 4495375
commit 503a1ba
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/Source/Client/Showcase.Client.App/Scripts/_references.js b/Source/Client/Showcase.Client.App/Scripts/_references.js
@@ -155,6 +155,5 @@
 /// <reference path="../app/common/token-input-directive.js" />
 /// <reference path="../app/project-details-page/project-description-directive.js" />
 /// <reference path="../app/projects-search-page/advanced-search-button-directive.js" />
-/// <reference path="../app/build/vendorjs2015082536.min.js" />
-/// <reference path="../app/build/alljs2015082536.min.js" />
+/// <reference path="../app/about-page/about-page-controller.js" />
 
diff --git a/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj b/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj
@@ -124,6 +124,8 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="app\about-page\about-page-controller.js" />
+    <Content Include="app\about-page\about-view.html" />
     <Content Include="app\add-project-page\add-project-controller.js" />
     <Content Include="app\add-project-page\add-project-data.js" />
     <Content Include="app\add-project-page\add-project-view.html" />

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
@@ -0,0 +1,11 @@
+(function () {
+    'use strict';
+
+    var aboutPageController = function addProjectController() {
+
+    };
+
+    angular
+        .module('showcaseSystem.controllers')
+        .controller('AboutPageController', [aboutPageController]);
+}());
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
@@ -0,0 +1,10 @@
+<section>
+    <div class="container" animate="fadeIn">
+        <div class="row">
+            <div class="col-md-offset-1 col-md-10">
+                <h1 class="text-center color999">About us</h1>
+
+            </div>
+        </div>
+    </div>
+</section>
diff --git 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
@@ -23,15 +23,10 @@
                 </a>
             </li>
             <li class="mega-menu">
-                <a href="http://academy.telerik.com" target="_blank">
+                <a href="/about">
                     INFO <span class="margin-top-2">about us</span>
                 </a>
             </li>
-            <li class="mega-menu">
-                <a href="http://telerikacademy.com" target="_blank">
-                    STUDENT SYSTEM <span class="margin-top-2">telerik academy</span>
-                </a>
-            </li>
         </ul>
     </nav>
 </div>