projects / Pman.Core / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
templates/master.html
[Pman.Core] / templates / master.html
diff --git a/templates/master.html b/templates/master.html
index df1944c..9dc78a2 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -7,12 +7,13 @@
       xmlns:xlink="http://www.w3.org/1999/xlink"> 
     <head>
         <title>{appName}</title>
+        <meta name="google" value="notranslate">
         <link rel="shortcut icon" href="./Pman.ico" type="image/vnd.microsoft.icon"/>
         
         
         <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()}
                      
    
@@ -84,17 +85,18 @@
         <div id="loading">
             <div class="loading-indicator" id="loading-text">&#160;Loading...(This may take a few seconds)</div>
         </div>
-        {t:r}
+       
         
 {if:bootLoader.Pman[roo_debug]}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-debug.js"></script>
-        <script type="text/javascript" src="{rootURL}/roojs1/ux/Iscroll.js"></script>  
+        <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 +104,7 @@
             appLang="lang"
             appName="appName"
             appNameShort="appNameShort"
+            appLogo="appLogo"
             appOwnerCompanyId="company.id"
              
             AppLinkError="linkFail"
@@ -115,7 +118,8 @@
             AppModules="appModules"
             AppVersion="appVersion"
             appDisabled="appDisabled"
-        >
+            uiConfig="uiConfig"
+        ></flexy:toJSON>
         
         <script type="text/javascript">
             Ext=Roo; // bc
@@ -135,8 +139,13 @@
            
         <!-- finally language.. -->   
         <script type="text/javascript" src="{baseURL}/Core/I18n.js"></script>
-               
-               
+        
+<!--        <script type="text/javascript" src="{rootURL}/roojs1/Roo/HtmlEditorCore.js"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/Roo/Toolbar.js"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/Roo/form/HtmlEditor.js"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/Roo/form/HtmlEditor/ToolbarContext.js"></script>
+        <script type="text/javascript" src="{rootURL}/roojs1/Roo/form/HtmlEditor/ToolbarStandard.js"></script>-->
+        
         <script type="text/javascript">
             Pman.debug = true;
         </script>
Pman Core