1.10.x
Julio Montoya 10 years ago
parent 2964727aad
commit 6961eec53f
  1. 1
      documentation/changelog.html
  2. 1
      documentation/credits.html
  3. 1
      documentation/dependencies.html
  4. 1
      documentation/index.html
  5. 1
      documentation/installation_guide.html
  6. 3
      documentation/installation_guide_es_ES.html
  7. 1
      documentation/installation_guide_fr_FR.html
  8. 1
      documentation/installation_guide_it_IT.html
  9. 1
      documentation/license.html
  10. 1
      documentation/migration-checklist.html
  11. 1
      documentation/optimization.html
  12. 1
      documentation/readme.html
  13. 1
      documentation/security.html
  14. 4
      main/inc/global_error_message.inc.php
  15. 11
      main/install/index.php
  16. 3
      main/install/install.lib.php

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Changelog</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Credits</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Server Dependencies</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Installation Guide</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -1,7 +1,8 @@
<html lang="es">
<head>
<meta charset="utf-8" />
<title>Guia de Instalación de Chamilo 1.9</title>
<title>Guia de Instalación de Chamilo 1.10</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
</head>

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Guide d'installation de Chamilo</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Guida di installazione di Chamilo LMS</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo License</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Migration Checklist</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Optimization Guide</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Information</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -2,6 +2,7 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Security Guide</title>
<link rel="stylesheet" href="../main/css/bootstrap.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../main/css/base.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />

@ -114,7 +114,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
$length = strlen($IncorrectPhpVersionDescription);
$read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
$IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
$IncorrectPhpVersionDescription .= '<br /><a class="btn" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
$IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
}
$global_error_message['description'] = $IncorrectPhpVersionDescription;
break;
@ -129,7 +129,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
<div class="install-mascot">
<p class="download-info">
<button class="btn btn-primary btn-large" type="submit" value="INSTALL Chamilo" >INSTALL Chamilo</button>
<a class="btn btn-large" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>
<a class="btn btn-default btn-large" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>
</p>
</div>
</form>';

@ -13,14 +13,11 @@
* @todo (busy) organise code into functions
* @package chamilo.install
*/
/**
* Init
*/
/* CONSTANTS */
use \ChamiloSession as Session;
define('SYSTEM_INSTALLATION', 1);
define('INSTALL_TYPE_UPDATE', 'update');
define('FORM_FIELD_DISPLAY_LENGTH', 40);
@ -314,7 +311,7 @@ if ($encryptPassForm == '1') {
/*]]>*/
</style>
<script type="text/javascript" src="../inc/lib/javascript/jquery.min.js"></script>
<script type="text/javascript" >
<script type="text/javascript">
$(document).ready( function() {
$("#button_please_wait").hide();
@ -332,7 +329,7 @@ if ($encryptPassForm == '1') {
$('#dbUserForm').attr('value','chamilo_main');
}
$("button").addClass('btn');
$("button").addClass('btn btn-default');
//Allow Chamilo install in IE
$("button").click(function() {
@ -495,7 +492,7 @@ if ($encryptPassForm == '1') {
</ol>
</div>
<div id="note">
<a class="btn" href="../../documentation/installation_guide.html" target="_blank">
<a class="btn btn-default" href="../../documentation/installation_guide.html" target="_blank">
<?php echo get_lang('ReadTheInstallationGuide'); ?>
</a>
</div>

@ -1040,7 +1040,8 @@ function display_language_selection() { ?>
<p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
<form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
<?php display_language_selection_box('language_list', api_get_interface_language()); ?>
<button type="submit" name="step1" class="btn next" value="<?php echo get_lang('Next'); ?>"><?php echo get_lang('Next'); ?></button>
<button type="submit" name="step1" class="btn btn-default next" value="<?php echo get_lang('Next'); ?>">
<?php echo get_lang('Next'); ?></button>
<input type="hidden" name="is_executable" id="is_executable" value="-" />
</form>
<br /><br />

Loading…
Cancel
Save