ENH: Improved installation process

application/configs/application.ini

@@ -1,8 +1,8 @@
 [global]
 ;development or production
-environment=development
+environment=production
 ;name of the application
-application.name=Midas
+application.name=MIDAS
 ;language of the application (en or fr)
 application.lang=en
 ;Optimize JS and CSS

application/controllers/InstallController.php

@@ -38,7 +38,7 @@ function indexAction()
       "simplexml"  => array(false, ""), 
     );
     $this->view->phpextension_missing=$this->Component->Utility->CheckPhpExtensions($phpextensions);
-    $this->view->writable=is_writable(BASE_PATH);  
+    $this->view->writable=is_writable(BASE_PATH.'/application/configs');  
     $this->view->convertfound=$this->Component->Utility->IsImageMagickWorking();   
     $this->view->basePath=BASE_PATH;
     if(!empty($_POST)&&$this->view->writable)
@@ -170,7 +170,7 @@ function step3Action()
 
     $assetstrores=$this->Assetstore->getAll();
     $formArray['assetstore']->addMultiOptions(array(
-                    $assetstrores[0]->getKey() => $assetstrores[0]->getName().' Path: '.$assetstrores[0]->getPath()                  
+                    $assetstrores[0]->getKey() => $assetstrores[0]->getPath()                  
                         ));    
 
     $this->view->form=$formArray;

application/controllers/forms/InstallForm.php

@@ -80,8 +80,8 @@ public function createConfigForm()
 
     $process = new Zend_Form_Element_Select('process');
     $process ->addMultiOptions(array(
-                    'onthefly' => 'On the Fly',
-                    'cron' => 'Using an external cron job' 
+                    'onthefly' => 'On the fly',
+                    'cron' => 'External' 
                         ));    
 
     $timezone = new Zend_Form_Element_Select('timezone');
@@ -92,8 +92,8 @@ public function createConfigForm()
 
     $environment = new Zend_Form_Element_Select('environment');
     $environment ->addMultiOptions(array(
-                    'production' => 'Production (no errors shown, faster)' ,
-                    'development' => 'Development (shows errors, slower)'                    
+                    'production' => 'Production' ,
+                    'development' => 'Development'                    
                         ));    
 
     $name = new Zend_Form_Element_Text('name');

application/views/install/step2.phtml

@@ -45,7 +45,6 @@
                 {$form['dbname']}
               </div>
               <div>
-                <input type='button' class='testConnection' value='Test Connexion' />
                 <div id='dbResult'>
                   <div>
                 <img style='display:none;' class='testLoading'  alt='' src='{$this->webroot}/public/images/icons/loading.gif'/>

application/views/install/step3.phtml

@@ -1,53 +1,64 @@
-<link href="<?php echo $this->webroot?>/public/css/install/install.css" rel="stylesheet" type="text/css" />
+
 <link href="<?php echo $this->webroot?>/public/css/install/install.step3.css" rel="stylesheet" type="text/css" />
 
 <?php
   $this->headScript()->appendFile($this->webroot.'/public/js/install/install.step3.js');
 ?>
 
-<div class="viewMain"> 
 
+<div class="viewMain">
      <h3>Configuration:</h3>
 
      <?php
       echo "<form class='genericForm' method='{$this->form['method']}'  action='{$this->form['action']}'>";
       echo "
-              <div>
+              <div class='installName'>
                 <label for='name'>Application name</label>
                 {$this->form['name']}
               </div>
-              <div>
+              <div class='installLang'>
                 <label for='lang'>Language</label>
                 {$this->form['lang']}
               </div>
-              <div>
+              <div class='installEnvironment'>
                 <label for='environment'>Environment</label>
                 {$this->form['environment']}
               </div>
-               <div>
+               <div class='installProcess'>
                 <label for='process'>Select process type</label>
                 {$this->form['process']}
-                <br/>
-                Windows: task manage using command: ".BASE_PATH."/library/Executable/windows/32/wget.exe -O ".BASE_PATH."/log/task.log http://localhost{$this->webroot}/task<br/>
-                Linux: cron job using command: wget -O ".BASE_PATH."/log/task.log http://localhost{$this->webroot}/task
               </div>
-              <div>
+              <div class='installTimezone'>
                 <label for='environment'>Timezone</label>
                 {$this->form['timezone']}
               </div>
-              <div>
+              <div class='installSmartoptimizer'>
                 <label for='smartoptimizer'>CSS and Javascript optimizer</label>
                 {$this->form['smartoptimizer']}
               </div>
-              <div>
+              <div class='installAssetstrore'>
                 <label for='assetstore'>Default Assetstore</label>
                 {$this->form['assetstore']}
               </div> 
               <div>
                 {$this->form['submit']}
               </div>
               </form>";
-      echo "</div>";
      ?>
+</div>
+<div class="viewSideBar">
+  <div class="sideElementFirst " >
+      <h1>Help</h1>
+      <div class="installHelp">
+        This page allow you to configure your installation.
+      </div>
+  </div>
+</div>
 
-</div>
+<div class='hiddenProcces' style="display:none;">
+  <?php 
+echo "<br/>
+    Windows:".BASE_PATH."<br/>/library/Executable/windows/32/<br/>wget.exe -O <br/>".BASE_PATH."<br/>/log/task.log<br/> http://localhost{$this->webroot}/task<br/><br/>
+    Linux:  wget -O ".BASE_PATH."<br/>/log/task.log http://localhost{$this->webroot}/task";
+    ?>
+</div>

index.php

@@ -20,6 +20,18 @@
 
 define('BASE_PATH', realpath(dirname(__FILE__)));
 
+if(!is_writable(BASE_PATH."/application/configs")||!is_writable(BASE_PATH."/log")||!is_writable(BASE_PATH."/data")||!is_writable(BASE_PATH."/tmp"))
+  {
+  echo "To use Midas, the following repertories have to be writable by apache:
+        <ul>
+          <li>".BASE_PATH."/application/configs</li>
+          <li>".BASE_PATH."/log</li>
+          <li>".BASE_PATH."/data</li>
+          <li>".BASE_PATH."/tmp</li>
+        </ul>";
+  exit();
+  }
+
 define('START_TIME',microtime(true));
 
 require_once 'Zend/Loader/Autoloader.php';
@@ -28,7 +40,7 @@
 $loader = Zend_Loader_Autoloader::getInstance();
 $loader->registerNamespace('App_');
 
-require_once(BASE_PATH . "/include.php");
+require_once(BASE_PATH . "/application/include.php");
 
 // Create application, bootstrap, and run
 $application = new Zend_Application('global', CORE_CONFIG);

public/css/install/install.step2.css

@@ -6,8 +6,7 @@
 }
 
 #dbResult div{
-  position: absolute;
-  width: 400px;
-  left: 350px;
-  top: -20px;
+  margin-left: 203px;
+  margin-top:4px;
+  height: 30px;
 }

public/js/layout/jquery.treeTable.js

@@ -124,6 +124,7 @@
       $(this).removeAttr('ajax');
       $(this).attr('proccessing',false);
       $(this).find('td:first img.tableLoading').hide();
+      initialize($(this));
       }