Dev: ComfortUpdate, presentation changes

application/views/admin/update/updater/steps/_backup.php

@@ -17,15 +17,15 @@
 ?>
 
 <div class="updater-background">
-    <p class="success text-left">
+    <p class="success " style="text-align: left;">
         <strong><?php echo sprintf(gT("File backup created: %s"),''); ?></strong>
         <br/>
         <?php echo $tempdir.DIRECTORY_SEPARATOR.'LimeSurvey_files_backup_'.$basefilename.'.zip'; ?>
     </p>
 
 
     <?php if($dbBackupInfos->result):?>
-        <p class="success text-left">
+        <p class="success " style="text-align: left;">
             <strong><?php eT('DB backup created:'); ?></strong>
             <br/>
             <?php eT($dbBackupInfos->message); ?>
@@ -52,13 +52,13 @@
             }
         ?>
 
-    <p class="warning text-left">           
+    <p class="warning " style="text-align: left;">           
         <strong><?php eT($db_message); ?></strong>
     </p>
 
     <?php endif;?>
 
-    <p class="information text-left"><?php eT('Please check any problems above and then proceed to the final step.'); ?>
+    <p class="information " style="text-align: left;"><?php eT('Please check any problems above and then proceed to the final step.'); ?>
 
     <?php $formUrl = Yii::app()->getController()->createUrl("admin/update/sa/step4/");?>
     <?php echo CHtml::beginForm($formUrl, 'post', array('id'=>'launchUpdate')); ?>                                              

application/views/admin/update/updater/steps/_check_local_errors.php

@@ -108,10 +108,6 @@
 <ul>
 
 <?php if($errors): ?>
-<p>
-    <strong><?php eT('When checking your installation we found one or more problems. Please check for any error messages above and fix these before you can proceed.'); ?></strong>
-</p>
-
     <?php
     if($ignore && ! $cant_ignore )
     {

application/views/admin/update/updater/steps/_fileSystem.php

@@ -28,7 +28,6 @@
 
     <?php if (count($readonlyfiles)>0):?>
             <br />
-            <?php echo gT('When checking your file permissions we found one or more problems. Please check for any error messages above and fix these before you can proceed.'); ?>
             <p>
                 <!--
                 <a class="button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only limebutton" href="<?php echo $urlNew;?>" role="button" aria-disabled="false">
@@ -51,8 +50,6 @@
             </p>
     <?php else: ?>
         <p>
-            <?php echo eT('Please check any problems above and then proceed to the next step.').'<br />'; ?>
-
             <?php 
                 $url = Yii::app()->createUrl('/admin/update/sa/backup');
                 echo CHtml::beginForm($url, 'post', array("id"=>"launchBackupForm"));

application/views/admin/update/updater/steps/textaeras/_existingfiles.php

@@ -11,7 +11,7 @@
 <?php if (count($existingfiles)>0): ?>
     <?php eT('The following files would be added by the update but already exist. This is very unusual and may be co-incidental.'); ?>
     <br />
-    <?php  eT('We recommend that these files should be replaced by the update procedure.');?>
+    <?php  eT('These files will be backuped and then replaced by the update procedure.');?>
     <br />
 <textarea readonly="readonly" style="background-color: #FFF; width: 800px; height: 150px; font-family: Monospace; font-size: 11px;">            
 <?php
@@ -21,9 +21,5 @@
 echo htmlspecialchars($existingfile['file'])."\n";
 }
 ?>
-</textarea>
-<?php else:?>
-    <p class="success text-left">
-        <?php  eT('No file added by the ComfortUpdate already exists.'); ?> 
-    </p>                
+</textarea>           
 <?php endif;?>

application/views/admin/update/updater/steps/textaeras/_modifiedfiles.php

@@ -10,7 +10,7 @@
 <?php if (count($modifiedfiles)>0): ?>
     <?php eT('The following files will be modified or deleted but were already modified by someone else.');?>
     <br/>
-    <?php eT('We recommend that these files should be replaced by the update procedure.');?>
+    <?php eT('These files will be backuped and then replaced by the update procedure.');?>
     <br/>
 <textarea readonly="readonly" style="background-color: #FFF; width: 800px; height: 150px; font-family: Monospace; font-size: 11px;">
 <?php
@@ -20,9 +20,5 @@
     echo htmlspecialchars($modifiedfile['file'])."\n";
 }?>
 </textarea>
-<?php  else:?>
-    <p class="success text-left">
-        <?php eT("No files that will be modified/deleted by the updater are already modified in the local installation."); ?>
-    </p>    
 <?php endif;?>
 

application/views/admin/update/updater/welcome/_error_files_update_updater.php

@@ -20,8 +20,6 @@
         <?php echo $readonly."<br/>";?>
     <?php endforeach; ?>
     <br/>
-    <?php eT('When checking your installation we found one or more problems. Please check for any error messages above and fix these before you can proceed.'); ?>
-
     <a class="button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only limebutton" href="<?php echo Yii::app()->createUrl("admin/globalsettings"); ?>" role="button" aria-disabled="false">
         <span class="ui-button-text"><?php eT("Cancel"); ?></span>
     </a>        

application/views/admin/update/updater/welcome/_welcome.php

@@ -9,7 +9,7 @@
 
 <?php $urlNew = Yii::app()->createUrl("admin/globalsettings", array("update"=>'newKey', 'destinationBuild' => $serverAnswer->destinationBuild)); ?>
 
-<h2 class="maintitle"><?php eT($serverAnswer->title);?></h2>
+<h2 class="maintitle"><?php eT('Welcome to the LimeSurvey ComfortUpdate!');?></h2>
 
 <?php
     if( isset($serverAnswer->html) )