X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=templates%2Fmaster.html;h=0009f8cce47a60ad84d9cd50a6a3b3afe57f1f09;hb=HEAD;hp=1e2edbebe6f9a6adc330e52ba5136d1ee5ed57c8;hpb=309abe12c4003f14f7eafa9f7a0fa2ea7f144b56;p=Pman.Core

diff --git a/templates/master.html b/templates/master.html
index 1e2edbeb..e65df15c 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -10,12 +10,13 @@
 
         <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" />  
- 
+        <link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/fonts/font-awesome.css" />
+
         {outputCSSIncludes()}
       
      </head>
@@ -39,21 +40,20 @@
         
         
         <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:bootLoader.Pman[roo_debug]}                  
-        <script type="text/javascript" src="{rootURL}/roojs1/roojs-debug.js?ts={version}"></script>
+   
+   {if:isDev}                  
+     <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:}                  
+    {else:}
+
         <script type="text/javascript" src="{rootURL}/roojs1/roojs-all.js?ts={version}"></script>
-                 
-{end:}                  
+    {end:}              
+
         <flexy:toJSON 
             baseURL="baseURL" 
             rootURL="rootURL"