# HG changeset patch # User nowmad@23.1.168.192.in-addr.arpa # Date 1446824883 -3600 # Node ID f95603fd2e186d52eb9a8027c84b17d600cb2bab # Parent 479b1dd5a8e3f24ecdee0d4f020f793ed328a5ee add baseStatic to APP env diff -r 479b1dd5a8e3 -r f95603fd2e18 cms/app-client/app/controllers/second-page.js --- a/cms/app-client/app/controllers/second-page.js Fri Nov 06 15:38:42 2015 +0100 +++ b/cms/app-client/app/controllers/second-page.js Fri Nov 06 16:48:03 2015 +0100 @@ -4,5 +4,5 @@ console.log(config); export default Ember.Controller.extend({ - logoUrl: config.baseStatic + "assets/images/logo.png" + logoUrl: config.APP.baseStatic + "assets/images/logo.png" }); diff -r 479b1dd5a8e3 -r f95603fd2e18 cms/app-client/config/environment.js --- a/cms/app-client/config/environment.js Fri Nov 06 15:38:42 2015 +0100 +++ b/cms/app-client/config/environment.js Fri Nov 06 16:48:03 2015 +0100 @@ -15,7 +15,7 @@ }; if (environment === 'development') { - ENV.baseStatic = ''; + ENV.APP.baseStatic = ''; // ENV.APP.LOG_RESOLVER = true; // ENV.APP.LOG_ACTIVE_GENERATION = true; // ENV.APP.LOG_TRANSITIONS = true;