From 98130e09eaf51b8cbe3e845c68cb98726bc7545a Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 25 Jan 2019 10:24:20 +0800
Subject: [PATCH] Fix #5680 - testing BS4 / envato

---
 Pman.php              | 18 +++---------------
 templates/master.html |  3 ++-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Pman.php b/Pman.php
index e10b2c25..724fd389 100644
--- a/Pman.php
+++ b/Pman.php
@@ -21,20 +21,7 @@ class Pman_BAdmin_Pman {
     {
         $ff = HTML_FlexyFramework2::get();
         
-        /*
-         not sure if we can delete this yet..
-         
-        $css_path = empty($ff->Pman['css_path']) ?
-            "{$pg->rootURL}/roojs1/css-bootstrap" :
-            ($pg->rootURL.'/'.$ff->Pman['css_path']);
         
-        $pg->assetArrayToHtml(array(
-            "{$pg->rootURL}/roojs1/css-bootstrap/font-awesome.css",
-            "{$css_path}/bootstrap.min.css",
-            "{$css_path}/roojs-bootstrap.css"
-            
-        ), 'css');
-        */
     }
    
     
@@ -44,10 +31,11 @@ class Pman_BAdmin_Pman {
         if (isset($ff->Pman['css_path'])) {
             return; // temporary until we migrate the live site
         }
+        
         $pg->css_includes[__CLASS__] =  array(
             "{$pg->rootURL}/roojs1/css-bootstrap/font-awesome.css",
-            "{$pg->rootURL}/bootstrap.min.css",
-            "{$pg->rootURL}/roojs-bootstrap.css"
+            "{$pg->rootURL}/roojs1/css-bootstrap/bootstrap.min.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap/roojs-bootstrap.css"
         );
         
     }
diff --git a/templates/master.html b/templates/master.html
index 205dc434..6f2e7a7e 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -14,7 +14,8 @@
 	    
 	<flexy:include src="favicon.html"></flexy:include>
 	 
-        {outputCSSIncludes()}
+        {outputCSSIncludes()} 
+	
 	
      </head>
      
-- 
2.39.2