Style fixes during installation

index.php

@@ -168,20 +168,22 @@ if (api_get_setting('display_categories_on_homepage') == 'true') {
 	echo '</div>';
 }
 
-
-$tpl = $controller->tpl->get_template('layout/layout_2_col.tpl');
 $controller->set_login_form();
 
 //@todo move this inside the IndexManager
 if (!api_is_anonymous()) {
-	$controller->tpl->assign('profile_block', 			$controller->return_profile_block());
-	$controller->tpl->assign('teacher_block', 			$controller->return_teacher_link());
+	$controller->tpl->assign('profile_block', $controller->return_profile_block());
+	
+	if (api_is_platform_admin()) {
+		$controller->tpl->assign('account_block',			$controller->return_account_block());
+	} else {		
+		$controller->tpl->assign('teacher_block', 			$controller->return_teacher_link());
+	}
 }
 
 $controller->tpl->assign('announcements_block', 	$controller->return_announcements());
-
 $controller->tpl->assign('home_page_block', 		$controller->return_home_page());
 $controller->tpl->assign('notice_block',			$controller->return_notice());
 $controller->tpl->assign('plugin_campushomepage', 	$controller->return_plugin_campushomepage());
 
-$controller->tpl->display($tpl);
+$controller->tpl->display_two_col_template();

main/install/index.php

@@ -484,16 +484,17 @@ if ($encryptPassForm == '1') {
 	</tr>
 <tr>
   <td>
-    <?php     
-    echo '<h1>';
-    echo get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version; 
-    echo '</h1>';
-    echo '<h2>';
+    <?php
+    echo '<h1>'.get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version.'</h1>';
+    
+    $instalation_type_label = '';
     if ($installType == 'new') 
-        echo get_lang('NewInstallation'); 
+        $instalation_type_label  = get_lang('NewInstallation'); 
     elseif ($installType == 'update') 
-        echo get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : ''); 
-    echo '</h2><hr />';    
+        $instalation_type_label = get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
+    if (!empty($instalation_type_label)) {
+    	echo "<h2>$instalation_type_label</h2><hr />";
+    }        
     ?>
 	<input type="hidden" name="updatePath"           value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
 	<input type="hidden" name="urlAppendPath"        value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
@@ -685,8 +686,11 @@ if ($_POST['step2']) {
 
 	<?php if ($installType == 'new'): ?>
 	<div style="background-color:#FFFFFF">	
-		<div class="warning-message"><center><h2><?php echo get_lang('Warning'); ?> !</h2></center><br />
-		<?php echo get_lang('TheInstallScriptWillEraseAllTables'); ?>
+		<div class="warning-message">
+		<center>
+			<h3><?php echo get_lang('Warning'); ?> !</h3>
+			<?php echo get_lang('TheInstallScriptWillEraseAllTables'); ?>
+		</center>
 		</div>	
 	</div>
 	<?php endif; ?>

main/install/install.lib.php

@@ -719,9 +719,9 @@ function load_database_script($db_script) {
     //execute the sql instructions
     $count = count($sql_instructions);
     for ($i = 0; $i < $count; $i++) {
-        $this_sql_query = $sql_instructions[$i]['query'];
+        $this_sql_query = $sql_instructions[$i]['query'];    
         Database::query($this_sql_query);
-    }
+    }    
 }
 
 /**
@@ -1346,7 +1346,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
 
         // And now display the choice buttons (go back or install)
         ?>
-        <p align="center">
+        <p align="center" style="padding-top:15px">
         <button type="submit" name="step1" class="back" onclick="javascript: window.location='index.php'; return false;" value="&lt; <?php echo get_lang('Previous'); ?>" ><?php echo get_lang('Previous'); ?></button>
         <button type="submit" name="step2_install" class="add" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> ><?php echo get_lang('NewInstallation'); ?></button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
@@ -1380,7 +1380,10 @@ function display_license_agreement() {
     ?>
     <table>
 		<tr><td>
-            <p style="font-size:75%"><textarea cols="80" rows="10" readonly><?php echo api_htmlentities(@file_get_contents(api_get_path(SYS_PATH).'documentation/license.txt')); ?></textarea></p>
+            <p style="font-size:90%">
+            <textarea cols="90" rows="7" readonly>
+            	<?php echo api_htmlentities(@file_get_contents(api_get_path(SYS_PATH).'documentation/license.txt')); ?>
+            </textarea></p>
         </td>
         </tr>
         <tr><td>
@@ -1388,7 +1391,7 @@ function display_license_agreement() {
             <label for="accept_licence"><?php echo get_lang('IAccept'); ?></label>
             </td>
 		</tr>
-        <tr><td><p><?php echo get_lang('DokeosArtLicense'); ?></p></td></tr>
+        <tr><td><p style="color:#666"><br /><?php echo get_lang('DokeosArtLicense'); ?></p></td></tr>
         <tr>
         	<td>
             <table width="100%">
@@ -1515,13 +1518,13 @@ function get_contact_registration_form() {
                             <option value="german">Deutsch</option>
                             <option selected="selected" value="english">English</option>
                             <option value="spanish">Spanish</option>
-                            <option value="french">Fran??ais</option>
+                            <option value="french">Français</option>
                             <option value="italian">Italian</option>
                             <option value="hungarian">Magyar</option>
                             <option value="dutch">Nederlands</option>
-                            <option value="brazilian">Portugu??s do Brasil</option>
-                            <option value="portuguese">Portugu??s europeu</option>
-                            <option value="slovenian">Sloven????ina</option>
+                            <option value="brazilian">Português do Brasil</option>
+                            <option value="portuguese">Português europeu</option>
+                            <option value="slovenian">Slovenčina</option>
                     </select>
             </div>
     </div>
@@ -1639,7 +1642,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
     </tr>
     <tr>
     <td>    
-    <table width="100%">
+    <table class="data_table_no_border">
     <tr>
       <td width="40%"><?php echo get_lang('DBHost'); ?> </td>
       <?php if ($installType == 'update'): ?>
@@ -1779,7 +1782,7 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
     echo '</div>';
 
     echo "</td></tr> <tr><td>";
-    echo "<table width=\"100%\">";
+    echo '<table class="data_table_no_border">';
 
     //First parameter: language
     echo "<tr>\n";
@@ -1928,10 +1931,9 @@ function display_after_install_message($installType, $nbr_courses) {
     echo ': ';
     printf(get_lang('ToProtectYourSiteMakeXAndYReadOnly'), 'main/inc/conf/configuration.php', 'main/install/index.php');
     echo '</div>';
-    ?>
-
-    </form>
-    <a class="portal" href="../../index.php"><?php echo get_lang('GoToYourNewlyCreatedPortal'); ?></a>
+    ?></form>
+    <br /><br />
+    <a class="a_button green" href="../../index.php"><?php echo get_lang('GoToYourNewlyCreatedPortal'); ?></a>
     <?php
 }