projects / Pman.BAdmin / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a0894b9)
sync
authorAlan Knowles <alan@roojs.com>
Thu, 31 Dec 2020 06:14:12 +0000 (14:14 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 31 Dec 2020 06:14:12 +0000 (14:14 +0800)
Pman.php patch | blob | history
templates/master.html patch | blob | history

diff --git a/Pman.php b/Pman.php
index e4c6ff7..8cff943 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -37,13 +37,23 @@ class Pman_BAdmin_Pman {
             "{$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/css-bootstrap/font-awesome.css",
+            "{$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"
         );
+        
     }
     
     
diff --git a/templates/master.html b/templates/master.html
index 633bc8b..2b27461 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -1,9 +1,5 @@
-<!DOCTYPE html 
-      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      xmlns:html="http://www.w3.org/1999/xhtml" 
-      xmlns:svg="http://www.w3.org/2000/svg"
+<!DOCTYPE html  > 
+<html    xmlns:svg="http://www.w3.org/2000/svg"
       xmlns:xlink="http://www.w3.org/1999/xlink"> 
     <head>
         <!-- core/template/master.html -->
@@ -22,16 +18,9 @@
     <body class="ytheme-gray">  
          
 {if:isDev}                  
-         
         <script type="text/javascript" src="{rootURL}/roojs1/roojs-core-debug.js"></script>
         <script type="text/javascript" src="{rootURL}/roojs1/roojs-bootstrap-debug.js"></script>
-       <!-- for testing
-       <script type="text/javascript" src="{rootURL}/roojs1/Roo/bootstrap/Card.js"></script>
-       <script type="text/javascript" src="{rootURL}/roojs1/Roo/bootstrap/Markdown.js"></script>
-       <script type="text/javascript" src="{rootURL}/roojs1/Roo/bootstrap/Modal.js"></script>
-       <script type="text/javascript" src="{rootURL}/roojs1/Roo/bootstrap/TriggerField.js"></script>
-       <script type="text/javascript" src="{rootURL}/roojs1/Roo/bootstrap/ComboBox.js"></script>
-       -->
+       
          
 {else:}                  
         <script type="text/javascript" src="{rootURL}/roojs1/roojs-core-debug.js"></script>
Bootstrap Admin UI