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 af13fa5..0009f8c 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -6,60 +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>
         <meta name="google" value="notranslate">
-        <link rel="shortcut icon" href="./Pman.ico" type="image/vnd.microsoft.icon"/>
-        
+        <flexy:include src="favicon.html"></flexy:include>
+                
         
         <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;-->   
@@ -81,7 +39,7 @@
         
         
         <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>
@@ -95,8 +53,7 @@
 {else:}                  
         <script type="text/javascript" src="{rootURL}/roojs1/roojs-all.js?ts={version}"></script>
                  
-{end:}            
-        <script type="text/javascript" src="{rootURL}/roojs1/Roo/form/ComboBoxArray.js"></script>
+{end:}                  
         <flexy:toJSON 
             baseURL="baseURL" 
             rootURL="rootURL" 
@@ -129,19 +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>
@@ -164,5 +123,4 @@
         </div>
           
     </body>
-</html>
-        
\ No newline at end of file
+</html>
\ No newline at end of file
Pman Core