chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor changes in the installation layout due changes in the chamilo theme

Browse Source
skala
Julio Montoya 15 years ago
parent 2d455a21c8
commit 4ecbde7245
4 changed files with 37 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/css/chamilo/default.css
  2. 19
      main/inc/global_error_message.inc.php
  3. 25
      main/install/index.php
  4. 22
      main/install/install.lib.php

2
main/css/chamilo/default.css
Unescape View File

@ -280,7 +280,7 @@ p, blockquote, ol, ul {
}
h1 {
font-size: 21px;
font-size: 24px;
}
h2 {
font-size: 18px;

19
main/inc/global_error_message.inc.php
Unescape View File

@ -52,6 +52,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
$theme = 'chamilo/';
$css_path = 'main/css/';
$css_file = $css_path.$theme.'default.css';
$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
$root_rel = htmlentities($_SERVER['PHP_SELF']);
@ -152,7 +153,9 @@ if (is_int($global_error_code) && $global_error_code > 0) {
$global_error_message['encoding'] = 'UTF-8';
$global_error_message['css'] = $css_def;
// {ORGANISATION} moved from the header
$global_error_message_page =
<<<EOM
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -168,15 +171,11 @@ if (is_int($global_error_code) && $global_error_code > 0) {
</head>
<body>
<div id="wrapper">
<div id="header">
<div id="header1">
<div id="institution">
{ORGANISATION}
</div>
<div id="header1">
</div>
<div class="clear"></div>
<div id="header2">&nbsp;</div>
<div id="header2"></div>
<div id="header3">
<ul>
<li id="current"><a href="#"><span id="tab_active">{SECTION}</span></a></li>
@ -189,7 +188,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
<div id="main">
<div style="text-align: center;">
<br /><br />{DESCRIPTION}<br /><br />
<div class="warning-message">{DESCRIPTION}</div>
{CODE}
</div>
</div>
@ -198,17 +197,15 @@ if (is_int($global_error_code) && $global_error_code > 0) {
</div>
<div id="footer">
<div class="copyright">{POWERED_BY}</div>
<div class="copyright">&nbsp;<br />{POWERED_BY}</div>
&nbsp;
</div>
</body>
</html>
EOM;
foreach ($global_error_message as $key => $value) {
$global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
}
header('Content-Type: text/html; charset='.$global_error_message['encoding']);
die($global_error_message_page);
}
}

25
main/install/index.php
Unescape View File

@ -431,12 +431,11 @@ if ($encryptPassForm == '1') {
<div id="header">
<div id="header1">
<div id="institution">
<?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?>
<?php if ($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); elseif ($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : ''); ?>
</div>
</div>
<div id="header2" style="height:50px">&nbsp;</div>
<div id="logo">
<img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
</div>
</div>
<div id="header3">
<ul>
<li id="current"><a href="#"><span id="tab_active"><?php echo get_lang('Installation'); ?></span></a></li>
@ -446,8 +445,7 @@ if ($encryptPassForm == '1') {
<div id="main">
<form style="padding: 0px; margin: 0px;" method="post" action="<?php echo api_get_self(); ?>?running=1&amp;installType=<?php echo $installType; ?>&amp;updateFromConfigFile=<?php echo urlencode($updateFromConfigFile); ?>">
<div id="installation_steps" style="width:220px">
<!-- <img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo logo" /> -->
<div id="installation_steps" style="width:220px">
<br />
<ol>
<li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
@ -470,6 +468,17 @@ if ($encryptPassForm == '1') {
</tr>
<tr>
<td>
<?php
echo '<h1>';
echo get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version;
echo '</h1>';
echo '<h2>';
if ($installType == 'new')
echo get_lang('NewInstallation');
elseif ($installType == 'update')
echo get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
echo '</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); ?>" />
<input type="hidden" name="pathForm" value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />

22
main/install/install.lib.php
Unescape View File

@ -56,7 +56,7 @@ function is_already_installed_system() {
* @param string Text to show when extension is available (defaults to 'No')
* @param boolean Whether this extension is optional (in this case show unavailable text in orange rather than red)
* @return string HTML string reporting the status of this extension. Language-aware.
* @author Christophe Gesché
* @author Christophe Gesch??
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @author Yannick Warnier <yannick.warnier@dokeos.com>
* @version Dokeos 1.8.1, May 2007
@ -104,7 +104,7 @@ function get_php_setting($val) {
*
* @param integer $var The variable to present as text
* @return string the string "true" or "false"
* @author Christophe Gesché
* @author Christophe Gesch??
*/
function true_false($var) {
return $var ? 'true' : 'false';
@ -992,7 +992,7 @@ function display_language_selection_box($name = 'language_list', $default_langua
* can be done in the language of the user
*/
function display_language_selection() { ?>
<h1><?php get_lang('WelcomeToTheDokeosInstaller'); ?></h1>
<h2><?php get_lang('WelcomeToTheDokeosInstaller'); ?></h2>
<h2><?php echo display_step_sequence(); ?><?php echo get_lang('InstallationLanguage'); ?></h2>
<p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
<form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@ -1026,7 +1026,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
}
// SERVER REQUIREMENTS
echo '<div class="RequirementHeading"><h1>'.get_lang('ServerRequirements').'</h1>';
echo '<div class="RequirementHeading"><h2>'.get_lang('ServerRequirements').'</h2>';
echo '<div class="RequirementText">'.get_lang('ServerRequirementsInfo').'</div>';
echo '<div class="RequirementContent">';
echo '<table class="requirements">
@ -1096,7 +1096,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
// RECOMMENDED SETTINGS
// Note: these are the settings for Joomla, does this also apply for Chamilo?
// Note: also add upload_max_filesize here so that large uploads are possible
echo '<div class="RequirementHeading"><h1>'.get_lang('RecommendedSettings').'</h1>';
echo '<div class="RequirementHeading"><h2>'.get_lang('RecommendedSettings').'</h2>';
echo '<div class="RequirementText">'.get_lang('RecommendedSettingsInfo').'</div>';
echo '<div class="RequirementContent">';
echo '<table class="requirements">
@ -1165,7 +1165,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
echo '</div>';
// DIRECTORY AND FILE PERMISSIONS
echo '<div class="RequirementHeading"><h1>'.get_lang('DirectoryAndFilePermissions').'</h1>';
echo '<div class="RequirementHeading"><h2>'.get_lang('DirectoryAndFilePermissions').'</h2>';
echo '<div class="RequirementText">'.get_lang('DirectoryAndFilePermissionsInfo').'</div>';
echo '<div class="RequirementContent">';
echo '<table class="requirements">
@ -1483,19 +1483,19 @@ function get_contact_registration_form() {
<div class="label">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</div>
<div class="formw">
<select id="language" name="language">
<option value="bulgarian">Български</option>
<option value="bulgarian">??????????????????</option>
<option value="indonesian">Bahasa Indonesia</option>
<option value="bosnian">Bosanski</option>
<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>

Write Preview
Loading…
Cancel
Save