Added installer sidebar view.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10863 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 27, 2011 · d74f826 · d74f826
1 parent 80e4b01
commit d74f826
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 189 deletions.
diff --git a/application/controllers/installer.php b/application/controllers/installer.php
@@ -62,7 +62,6 @@ function _checkInstallation()
             show_error('Installation has been done already.');
             exit();
         }
-
     }
 
 
@@ -113,10 +112,10 @@ function install($step=0)
 
                 //mbstring library check
                 if ( function_exists('mb_convert_encoding') )
-                $aData['mbstringPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" />";
+                $aData['mbstringPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" alt=\"Check\" />";
                 else
                 {
-                    $aData['mbstringPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" />";
+                    $aData['mbstringPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" alt=\"Check\" />";
                     $bProceed=false;
                 }
 
@@ -221,26 +220,29 @@ function install($step=0)
                 //optional settings check
                 //gd library check
                 $gdArray = gd_info();
+
+                // FIXME output code belongs into view
+                // FIXME provide array structure instead of variable names
 
                 if ( $gdArray["FreeType Support"] )
-                $aData['gdPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" />";
+                $aData['gdPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" alt=\"Check\" />";
                 else
-                $aData['gdPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" />";
+                $aData['gdPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" alt=\"Check\" />";
                 //ldap library check
                 if ( function_exists('ldap_connect') )
-                $aData['ldapPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" />";
+                $aData['ldapPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" alt=\"Check\" />";
                 else
-                $aData['ldapPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" />";
+                $aData['ldapPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" alt=\"Check\" />";
                 //php zip library check
                 if ( function_exists('zip_open') )
-                $aData['zipPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" />";
+                $aData['zipPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" alt=\"Check\" />";
                 else
-                $aData['zipPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" />";
+                $aData['zipPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" alt=\"Check\" />";
                 //zlib php library check
                 if ( function_exists('zlib_get_coding_type') )
-                $aData['zlibPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" />";
+                $aData['zlibPresent'] = "<img src=\"".base_url()."installer/images/tick-right.gif\" alt=\"Check\" />";
                 else
-                $aData['zlibPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" />";
+                $aData['zlibPresent'] = "<img src=\"".base_url()."installer/images/tick-wrong.png\" alt=\"Check\" />";
 
 
 

diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php
@@ -1,34 +1,13 @@
 <?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
-<div class="container_6">
-<div class="grid_2 table">
-<p class="title"> &nbsp;Progress</p>
-<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
-<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
-<br />
-<div id="steps">
-<table class="grid_2" >
-<tr class="<?php echo $classesForStep[0]; ?>">
-<td>1: License</td>
-</tr>
-<tr class="<?php echo $classesForStep[1]; ?>">
-<td>2: Pre-installation check</td>
-</tr>
-<tr class="<?php echo $classesForStep[2]; ?>">
-<td>3: Configuration </td>
-</tr>
-<tr class="<?php echo $classesForStep[3]; ?>">
-<td>4: Database settings </td>
-</tr>
-<tr class="<?php echo $classesForStep[4]; ?>">
-<td>5: Optional settings</td>
-</tr>
-</table>
-</div>
-
 
+<div class="container_6">
 
+<?php $this->load->view('installer/sidebar_view', array(
+       'progressValue' => $progressValue,
+       'classesForStep' => $classesForStep
+    ));
+?>
 
-</div>
 <div class="grid_4 table">
 
 <p class="title">&nbsp;<?php echo $title; ?></p>

diff --git a/application/views/installer/dbsettings_view.php b/application/views/installer/dbsettings_view.php
@@ -1,34 +1,13 @@
 <?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
-<div class="container_6">
-<div class="grid_2 table">
-<p class="title"> &nbsp;Progress</p>
-<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
-<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
-<br />
-<div id="steps">
-<table class="grid_2" >
-<tr class="<?php echo $classesForStep[0]; ?>">
-<td>1: License</td>
-</tr>
-<tr class="<?php echo $classesForStep[1]; ?>">
-<td>2: Pre-installation check</td>
-</tr>
-<tr class="<?php echo $classesForStep[2]; ?>">
-<td>3: Configuration </td>
-</tr>
-<tr class="<?php echo $classesForStep[3]; ?>">
-<td>4: Database settings </td>
-</tr>
-<tr class="<?php echo $classesForStep[4]; ?>">
-<td>5: Optional settings</td>
-</tr>
-</table>
-</div>
-
 
+<div class="container_6">
 
+<?php $this->load->view('installer/sidebar_view', array(
+       'progressValue' => $progressValue,
+       'classesForStep' => $classesForStep
+    ));
+?>
 
-</div>
 <div class="grid_4 table">
 
 <p class="title">&nbsp;<?php echo $title; ?></p>

diff --git a/application/views/installer/footer_view.php b/application/views/installer/footer_view.php
@@ -2,7 +2,7 @@
 &nbsp;
 </div>
 <div class="container_6">
-<div class="grid_6" style="-moz-border-radius:15px; border-radius:15px; background: none repeat scroll 0 0 #EEEEEE;"><center><img src="<?php echo base_url(); ?>installer/images/poweredby.png" /></center></div>
+<div class="grid_6" style="-moz-border-radius:15px; border-radius:15px; background: none repeat scroll 0 0 #EEEEEE;"><center><img src="<?php echo base_url(); ?>installer/images/poweredby.png" alt="Powered by LimeSurvey" /></center></div>
 
 </div>
 

diff --git a/application/views/installer/license_view.php b/application/views/installer/license_view.php
@@ -1,48 +1,20 @@
-<?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
-
+<?php $this->load->view("installer/header_view", array('progressValue' => $progressValue)); ?>
 
 <div class="container_6">
-<div class="grid_2 table">
-<p class="title"> &nbsp;Progress</p>
-<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
-<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
-<br />
-<div id="steps">
-<table class="grid_2" >
-<tr class="<?php echo $classesForStep[0]; ?>">
-<td>1: License</td>
-</tr>
-<tr>
-<td></td>
-</tr>
-<tr class="<?php echo $classesForStep[1]; ?>">
-<td>2: Pre-installation check</td>
-</tr>
-<tr class="<?php echo $classesForStep[2]; ?>">
-<td>3: Configuration </td>
-</tr>
-<tr class="<?php echo $classesForStep[3]; ?>">
-<td>4: Database settings </td>
-</tr>
-<tr class="<?php echo $classesForStep[4]; ?>">
-<td>5: Optional settings</td>
-</tr>
-</table>
-</div>
-
-
 
+<?php $this->load->view('installer/sidebar_view', array(
+       'progressValue' => $progressValue,
+       'classesForStep' => $classesForStep
+    ));
+?>
 
-</div>
 <div class="grid_4 table">
 
 
 <p class="title">&nbsp;<?php echo $title; ?></p>
 
 
 
-
-
 <div style="-moz-border-radius:15px; border-radius:15px;" >
 <p>&nbsp;<?php echo $descp; ?></p>
 <hr />

diff --git a/application/views/installer/optconfig_view.php b/application/views/installer/optconfig_view.php
@@ -1,34 +1,13 @@
 <?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
-<div class="container_6">
-<div class="grid_2 table">
-<p class="title"> &nbsp;Progress</p>
-<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
-<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
-<br />
-<div id="steps">
-<table class="grid_2" >
-<tr class="<?php echo $classesForStep[0]; ?>">
-<td>1: License</td>
-</tr>
-<tr class="<?php echo $classesForStep[1]; ?>">
-<td>2: Pre-installation check</td>
-</tr>
-<tr class="<?php echo $classesForStep[2]; ?>">
-<td>3: Configuration </td>
-</tr>
-<tr class="<?php echo $classesForStep[3]; ?>">
-<td>4: Database settings </td>
-</tr>
-<tr class="<?php echo $classesForStep[4]; ?>">
-<td>5: Optional settings</td>
-</tr>
-</table>
-</div>
-
 
+<div class="container_6">
 
+<?php $this->load->view('installer/sidebar_view', array(
+       'progressValue' => $progressValue,
+       'classesForStep' => $classesForStep
+    ));
+?>
 
-</div>
 <div class="grid_4 table">
 
 <p class="title">&nbsp;<?php echo $title; ?></p>

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -1,34 +1,13 @@
 <?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
-<div class="container_6">
-<div class="grid_2 table">
-<p class="title"> &nbsp;Progress</p>
-<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
-<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
-<br />
-<div id="steps">
-<table class="grid_2" >
-<tr class="<?php echo $classesForStep[0]; ?>">
-<td>1: License</td>
-</tr>
-<tr class="<?php echo $classesForStep[1]; ?>">
-<td>2: Pre-installation check</td>
-</tr>
-<tr class="<?php echo $classesForStep[2]; ?>">
-<td>3: Configuration </td>
-</tr>
-<tr class="<?php echo $classesForStep[3]; ?>">
-<td>4: Database settings </td>
-</tr>
-<tr class="<?php echo $classesForStep[4]; ?>">
-<td>5: Optional settings</td>
-</tr>
-</table>
-</div>
-
 
+<div class="container_6">
 
+<?php $this->load->view('installer/sidebar_view', array(
+       'progressValue' => $progressValue,
+       'classesForStep' => $classesForStep
+    ));
+?>
 
-</div>
 <div class="grid_4 table">
 
 <p class="title">&nbsp;<?php echo "$title"; ?></p>
@@ -54,7 +33,7 @@
 </tr>
 <tr>
 <td style="width: 209px;">mbstring library</td>
-<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" /></td>
+<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" alt="Check" /></td>
 <td align="center" style="width: 225px;"><?php echo $mbstringPresent ; ?></td>
 </tr>
 <tr>
@@ -94,22 +73,22 @@
 </tr>
 <tr>
 <td style="width: 209px;">GD library</td>
-<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" /></td>
+<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" alt="Check" /></td>
 <td align="center" style="width: 225px;"><?php echo $gdPresent ; ?></td>
 </tr>
 <tr>
 <td style="width: 209px;">LDAP library</td>
-<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" /></td>
+<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" alt="Check" /></td>
 <td align="center" style="width: 225px;"><?php echo $ldapPresent ; ?></td>
 </tr>
 <tr>
 <td style="width: 209px;">PHP zip library</td>
-<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" /></td>
+<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" alt="Check" /></td>
 <td align="center" style="width: 225px;"><?php echo $zipPresent ; ?></td>
 </tr>
 <tr>
 <td style="width: 209px;">PHP zlib library</td>
-<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" /></td>
+<td align="center" style="width: 225px;"><img src="<?php echo base_url(); ?>installer/images/tick-right.gif" alt="Check" /></td>
 <td align="center" style="width: 225px;"><?php echo $zlibPresent ; ?></td>
 </tr>
 

diff --git a/application/views/installer/sidebar_view.php b/application/views/installer/sidebar_view.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Web Installer Sidebar (Progressbar and Step-Listing) Viewscript
+ */
+?>
+<div class="grid_2 table">
+<p class="title"> &nbsp;Progress</p>
+<p> &nbsp;<?php echo $progressValue ; ?>% Completed</p>
+<div style="width: 320px; height: 20px; margin-left: 6px;" id="progressbar"></div>
+<br />
+<div id="steps">
+<table class="grid_2" >
+<tr class="<?php echo $classesForStep[0]; ?>">
+<td>1: License</td>
+</tr>
+<tr>
+<td></td>
+</tr>
+<tr class="<?php echo $classesForStep[1]; ?>">
+<td>2: Pre-installation check</td>
+</tr>
+<tr class="<?php echo $classesForStep[2]; ?>">
+<td>3: Configuration </td>
+</tr>
+<tr class="<?php echo $classesForStep[3]; ?>">
+<td>4: Database settings </td>
+</tr>
+<tr class="<?php echo $classesForStep[4]; ?>">
+<td>5: Optional settings</td>
+</tr>
+</table>
+</div>
+</div>