Merge pull request #12 from ricardo-devis-agullo/custom-logo-and-title

added customization for logo and title
opentable · Dec 8, 2016 · 7f660c8 · 7f660c8
2 parents a2ca6db + 1b30c1d
commit 7f660c8
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/client/configuration/config.js b/client/configuration/config.js
diff --git a/client/js/app.js b/client/js/app.js
@@ -26,6 +26,9 @@ featureToggleFrontend.config(function ($routeProvider, $locationProvider, $httpP
     $httpProvider.defaults.headers.post = {'Content-Type': 'application/json'};
 });
 
-featureToggleFrontend.run(function (editableOptions) {
+featureToggleFrontend.run(function ($rootScope, editableOptions, ENV) {
     editableOptions.theme = 'bs3';
+    $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
+        $rootScope.title = current.$$route.title || ENV.customization.title;
+    });
 });
diff --git a/client/js/controllers/loginController.js b/client/js/controllers/loginController.js
@@ -1,6 +1,8 @@
 'use strict';
 
 featureToggleFrontend.controller('LoginController', ['$scope', '$window', 'ENV', function ($scope, $window, ENV) {
+    $scope.logo = ENV.customization.logo;
+
     if (ENV.RequiresAuth) {
         var authProvider = Object.keys(ENV.AuthProviders)[0];
 

diff --git a/client/js/controllers/sideBarController.js b/client/js/controllers/sideBarController.js
@@ -1,10 +1,11 @@
 'use strict';
 
-featureToggleFrontend.controller('SideBarController', ['$scope', 'applicationService', 'authorisationService', '$location', 'focus', 'CurrentUser', function ($scope, applicationService, authorisationService, $location, focus, CurrentUser) {
+featureToggleFrontend.controller('SideBarController', ['$scope', 'applicationService', 'authorisationService', '$location', 'focus', 'CurrentUser', 'ENV', function ($scope, applicationService, authorisationService, $location, focus, CurrentUser, ENV) {
     $scope.applications = [];
     $scope.newApplicationName = '';
     $scope.adding = false;
     $scope.CurrentUser = CurrentUser;
+    $scope.logo = ENV.customization.logo;
 
     var loadApplications = function () {
         applicationService.getApplications(

diff --git a/client/views/login.pug b/client/views/login.pug
@@ -1,21 +1,21 @@
 doctype html
-html(lang='en')
+html(lang='en' ng-app='featureToggleFrontend' ng-cloak)
     head
         meta(name='viewport', content='width=device-width, initial-scale=1')
-        title Opentable Feature Toggles
+        title(ng-bind="$root.title")
         link(href='/bower_components/bootstrap/dist/css/bootstrap.min.css', media='all', rel='stylesheet')
         link(href='/css/dashboard.css', media='all', rel='stylesheet')
         link(href='/css/toggleswitch.css', media='all', rel='stylesheet')
         link(href='/bower_components/bootstrap-social/bootstrap-social.css', media='all', rel='stylesheet')
         link(href='/bower_components/font-awesome/css/font-awesome.css', media='all', rel='stylesheet')
         script(src='/bower_components/jquery/dist/jquery.min.js')
-    body(ng-app='featureToggleFrontend' ng-cloak)
+    body
         #wrapper
             #sidebar-wrapper
                 ul.sidebar-nav(ng-controller="LoginController")
                     li.sidebar-brand
                         a.navbar-brand.logo(href='/')
-                            img(src='/img/opentable-hr-mono.png')
+                            img(ng-src='{{logo}}')
                         a(href='/auth/google',ng-if="authProvider == 'GoogleAuth'").btn.btn-block.btn-social.btn-google-plus.sign-in
                             i.fa.fa-google-plus
                             | Sign in with Google

diff --git a/client/views/main.pug b/client/views/main.pug
@@ -1,8 +1,8 @@
 doctype html
-html(lang='en')
+html(lang='en' ng-app='featureToggleFrontend')
     head
         meta(name='viewport', content='width=device-width, initial-scale=1')
-        title Opentable Feature Toggles
+        title(ng-bind="$root.title")
         link(href='/bower_components/bootstrap/dist/css/bootstrap.min.css', media='all', rel='stylesheet')
         link(href='/css/dashboard.css', media='all', rel='stylesheet')
         link(href='/bower_components/angular-xeditable/dist/css/xeditable.css' rel='stylesheet')
@@ -11,7 +11,7 @@ html(lang='en')
         script(src='/bower_components/jquery/dist/jquery.min.js')
         script(type="text/javascript").
             window.user = !{JSON.stringify(user || {}, null, 2)};
-    body(ng-app='featureToggleFrontend')
+    body
         #wrapper
             include ./sidebar.pug
             #page-content-wrapper

diff --git a/client/views/sidebar.pug b/client/views/sidebar.pug
@@ -2,7 +2,7 @@
     ul.sidebar-nav
         li.sidebar-brand
             a.navbar-brand.logo(href='/')
-                img(src='/img/opentable-hr-mono.png')
+                img(ng-src='{{logo}}')
         li
             .profile
                 img.media-object.img-circle(ng-src='{{CurrentUser.getPicture()}}', alt='avatar')

diff --git a/config/config.json b/config/config.json
@@ -40,5 +40,9 @@
     },
     "hooks": [
       "server/exampleHook.js"
-    ]
+    ],
+    "customization": {
+        "logo": "/img/opentable-hr-mono.png",
+        "title": "Opentable Feature Toggles"
+    }
 }