BS4 support

diff --git a/Pman.Dialog.BAdminCompany.bjs b/Pman.Dialog.BAdminCompany.bjs
index 7885022..515c680 100644 (file)
--- a/Pman.Dialog.BAdminCompany.bjs
+++ b/Pman.Dialog.BAdminCompany.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.BAdminCompany",
  "parent" : "Pman.Tab.BAdmin",
  "title" : "",
- "path" : "/home/john/gitlive/web.coba/Pman/BAdmin/Pman.Dialog.BAdminCompany.bjs",
+ "path" : "/home/alan/gitlive/Pman.BAdmin/Pman.Dialog.BAdminCompany.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -93,9 +93,9 @@
              "listeners" : {
               "render" : "function (_self)\n{\n    _this.type = _self;\n    _self.store.load({});\n}"
              },
+             "Boolean allowBlank" : false,
              "String loadingText" : "Searching...",
              "Boolean selectOnFocus" : true,
-             "Boolean allowBlank" : false,
              "String name" : "comptype_display_name",
              "Number minChars" : 2,
              "String valueField" : "name",

diff --git a/Pman.php b/Pman.php
index 724fd38..e4c6ff7 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -31,13 +31,19 @@ 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}/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/css-bootstrap4/bootstrap.min.css",
+            "{$pg->rootURL}/roojs1/css-bootstrap4/roojs-bootstrap.css"
+        );
     }
     
     

diff --git a/badmin.css b/badmin.css
index bc69e9c..bfc2aaa 100644 (file)
--- a/badmin.css
+++ b/badmin.css
@@ -1,12 +1,15 @@
 .navbar-brand {
-    height: 50px;
+/*    height: 50px; */
     padding: 0;
 }
-
+/*
 .navbar-brand>img {
     height: 50px;
 }
-
+*/ 
+.navbar.fixed-top {
+    padding:5px;
+}
 .dropdown-menu.user-menu {
     -webkit-border-radius: 0;
     -moz-border-radius: 0;

diff --git a/templates/master.html b/templates/master.html
index 6f2e7a7..619cc52 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -9,8 +9,8 @@
         <!-- core/template/master.html -->
 
         <title>{appName}</title>
-        <meta name="google" value="notranslate">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+        <meta name="google" value="notranslate" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
            
        <flexy:include src="favicon.html"></flexy:include>