projects / Pman.Core / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
PHP7 fix
[Pman.Core] / templates / master.html
diff --git a/templates/master.html b/templates/master.html
index f0499e8..0009f8c 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -6,62 +6,18 @@
       xmlns:svg="http://www.w3.org/2000/svg"
       xmlns:xlink="http://www.w3.org/1999/xlink"> 
     <head>
+        <!-- core/template/master.html -->
+
         <title>{appName}</title>
-        <link rel="shortcut icon" href="./Pman.ico" type="image/vnd.microsoft.icon"/>
-        
+        <meta name="google" value="notranslate">
+        <flexy:include src="favicon.html"></flexy:include>
+                
         
-            <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css/roojs-debug.css" />  
-         <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css/xtheme-slate-debug.css" />  
-         <!--
-        <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/cssX/roojs-all.css" />
-        -->
+        <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css/roojs.css" />  
+        <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css/xtheme-slate.css" />  
+ 
         {outputCSSIncludes()}
-        
-                    
-   
-    <style>
-     #loading-logo-bottom,
-     #loading-logo-center,
-     #loading-logo-tile,
-     #loading-logo-tile-top
-     {
-        width:100%;
-        height:100%;
-        position:absolute;
-       
-        left:0;
-        top:0;
-        background-position:50% 50%;
-    }
-    
-    /* background-tile.jpg */
-    #loading-logo-tile {
-         z-index:1000;
-    }
-    
-    /* background.jpg */
-    #loading-logo-center
-    {
-        background-position:50% 0;
-        background-repeat:no-repeat; 
-        z-index:1001;
-    }
-    /* background-tile-top.jpg */
-    #loading-logo-tile-top
-    {
-        background-position:50% 0;
-        z-index:1002;
-        background-repeat:repeat-x; 
-        
-    }
-    /* background_bottom_logo.gif */
-    #loading-logo-bottom
-    {
-        background-position:50% 100%;
-        background-repeat:no-repeat; 
-        z-index:1003;
-    }
-    </style>
+      
      </head>
     <body class="ytheme-gray">  
          <!--background:#F8ECB2;-->   
@@ -83,18 +39,22 @@
         
         
         <div id="loading-mask"
-            style="width:1;height:1;position:absolute;z-index:1000;left:0;top:0;">&#160;</div>
+            style="width:1px;height:1px;position:absolute;z-index:1000;left:0;top:0;">&#160;</div>
         <div id="loading">
             <div class="loading-indicator" id="loading-text">&#160;Loading...(This may take a few seconds)</div>
         </div>
-{if:isDev}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-debug.js"></script>  
+       
+        
+{if:bootLoader.Pman[roo_debug]}                  
+        <script type="text/javascript" src="{rootURL}/roojs1/roojs-debug.js?ts={version}"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/roojs-calendar-debug.js?ts={version}"></script>
+        <!-- <script type="text/javascript" src="{rootURL}/roojs1/ux/Iscroll.js"></script>  -->
          
 {else:}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-all.js"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/roojs-all.js?ts={version}"></script>
                  
 {end:}                  
-        <flexy:toJavascript 
+        <flexy:toJSON 
             baseURL="baseURL" 
             rootURL="rootURL" 
             isDev="isDev"
@@ -102,6 +62,7 @@
             appLang="lang"
             appName="appName"
             appNameShort="appNameShort"
+            appLogo="appLogo"
             appOwnerCompanyId="company.id"
              
             AppLinkError="linkFail"
@@ -114,7 +75,9 @@
             
             AppModules="appModules"
             AppVersion="appVersion"
-        >
+            appDisabled="appDisabled"
+            uiConfig="uiConfig"
+        ></flexy:toJSON>
         
         <script type="text/javascript">
             Ext=Roo; // bc
@@ -123,16 +86,21 @@
         </script>
         
         {outputJavascriptIncludes()}
-             
+            
         <!-- used by App.php in Builder - to enable loading of code/applicaiton on the fly -->
         {foreach:builderJs,js}
             <script type="text/javascript" src="{baseURL}/Builder/Code/{js}.js"></script>    
         {end:} 
            
+        
+        {if:hasModule(#Cms#)}
+            <script type="text/javascript" src="{baseURL}/Cms/OutputTranslations/{bootLoader.locale}"></script>
+        {end:}
+           
+           
         <!-- finally language.. -->   
         <script type="text/javascript" src="{baseURL}/Core/I18n.js"></script>
-               
-               
+        
         <script type="text/javascript">
             Pman.debug = true;
         </script>
@@ -150,10 +118,9 @@
           
            
         <div id="mainlist" class="x-layout-inactive-content">
-            <p>main list</p>
+            <p>main body</p>
                 
         </div>
           
     </body>
-</html>
-        
\ No newline at end of file
+</html>
\ No newline at end of file
Pman Core