make holiday extend Cli

diff --git a/Import/Core_holiday.php b/Import/Core_holiday.php
index 71b6aad..d52306b 100644 (file)
--- a/Import/Core_holiday.php
+++ b/Import/Core_holiday.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once 'Pman/Roo.php';
+require_once 'Pman/Core/Cli.php';
 
-class Pman_Core_Import_Core_holiday extends Pman_Roo 
+class Pman_Core_Import_Core_holiday extends Pman_Core_Cli 
 {
     static $cli_desc = "Update the holiday database (HK Only at present)"; 
     

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 0b91394..64b2bcc 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -1258,8 +1258,7 @@ class Pman_Core_UpdateDatabase extends Pman
             'gifsicle', // used for gif conversions
         );
          
-         
-         
+          
         // these are prefered - but may have complicated depenacies
         $pref = $pref !== false ? $pref :  array(
             'abiword',

diff --git a/templates/master.html b/templates/master.html
index d5aac4b..9174821 100644 (file)
--- a/templates/master.html
+++ b/templates/master.html
@@ -44,17 +44,16 @@
         <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>
         <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?ts={version}"></script>
-                 
-{end:}                  
+              
+
         <flexy:toJSON 
             baseURL="baseURL" 
             rootURL="rootURL"