PHP8

[Pman.BAdmin] / Pman.php

diff --git a/Pman.php b/Pman.php
index fe743e9..d0b6e94 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -7,34 +7,52 @@
  * how this should work:
  *
  * Top Pman.php should call
- *    fetchCSSIncludes($pg, &$array)
- *    then it shoud return $array with any new paths added.
+ *    
+ *    applyCSSIncludes($pg)
+ *    then it mody $pg->css_includes[__CLASS__] with any new paths added.
  *
  *    that way later modules can remove css from the path, or replace it compeletly..
  *
  */
 class Pman_BAdmin_Pman {
     
+    
     function outputCSSIncludes($pg)
     {
         $ff = HTML_FlexyFramework2::get();
-        
-        $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');
+        return ''; // ?? what here?
         
     }
+   
     
-    function applyCSSIncludes($pgt)
+    function applyCSSIncludes($pg)
     {
-        $pg->css_includes[] = 'hello.css';
+        
+        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}/roojs1/css-bootstrap/bootstrap.min.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap/roojs-bootstrap.css"
+        );
+        
+        // BS4
+         
+        $pg->css_includes[__CLASS__] =  array(
+            "{$pg->rootURL}/roojs1/fonts/font-awesome.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap4/bootstrap.min.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap4/roojs-bootstrap.css"
+        );/* */
+        // let's try the new look?
+         
+        $pg->css_includes[__CLASS__] =  array(
+            "{$pg->rootURL}/roojs1/fonts/nunito.css",
+            "{$pg->rootURL}/roojs1/fonts/font-awesome.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap4/sb-admin-2.min.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap4/roojs-bootstrap.css"
+        );
         
     }