Merge pull request #151 from aismail/f/#146-create-USE_BRANDING-flag

Created USE_BRANDING and EXTRA_BRANDING (#146)
aismail · May 17, 2013 · 1914fb2 · 1914fb2
2 parents 8f35ded + d9b3739
commit 1914fb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/conf/general.js b/app/conf/general.js
@@ -15,6 +15,9 @@ App.general = {
     SVG_PATH: '/public/svg',
     ENVIRONMENT: 'testing',
 
+    //CSS files used for branding purposes
+    EXTRA_BRANDING: [],
+
     // Throw exceptions and don't catch them with our wrapper
     // so that we can debug them easier.
     THROW_UNCAUGHT_EXCEPTIONS: true,
@@ -52,4 +55,4 @@ if (App.general.ENVIRONMENT !== 'production')
 
 if (typeof module != 'undefined') {
     module.exports.general = App.general;
-}
+}
diff --git a/app/includes.js b/app/includes.js
@@ -37,7 +37,9 @@ function getStaticUrl() {
 
 function includeCssAndJs() {
     includeStaticFilesInBundles();
-    includeBranding();
+    if (App.general.EXTRA_BRANDING.length){
+        includeBranding(App.general.EXTRA_BRANDING);
+    }
     includeMainEntryPoint();
     includeTemplates();
 }
@@ -102,9 +104,11 @@ function includeStaticFilesInBundles_Development() {
  *       Also, we cannot use includeCss because we need it to have an ID
  *       (#custom-css).
  */
-function includeBranding() {
-   document.write("<link rel='stylesheet' id='custom-css' " +
-                  "href='/assets/custom.css'/>");
+function includeBranding(files) {
+    for(var i=0; i < files.length;i++) {
+        document.write("<link rel='stylesheet' id='custom-css' " +
+                      "href= '" + files[i] + "'/>");
+    }
 }
 
 /*
@@ -180,4 +184,4 @@ function replaceReferencesFromConfigVariables() {
 
 overrideGeneralConfigWithUserConfig();
 replaceReferencesFromConfigVariables();
-includeCssAndJs();
+includeCssAndJs();