Skip to content

Commit 4ecbde7

Browse files
jmontoyaajmontoyaa
committed
Minor changes in the installation layout due changes in the chamilo theme
1 parent 2d455a2 commit 4ecbde7

File tree

4 files changed

+37
-31
lines changed

4 files changed

+37
-31
lines changed

‎main/css/chamilo/default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ p, blockquote, ol, ul {
280280
}
281281

282282
h1 {
283-
font-size: 21px;
283+
font-size: 24px;
284284
}
285285
h2 {
286286
font-size: 18px;

‎main/inc/global_error_message.inc.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
$theme = 'chamilo/';
5353
$css_path = 'main/css/';
5454
$css_file = $css_path.$theme.'default.css';
55+
5556

5657
$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
5758
$root_rel = htmlentities($_SERVER['PHP_SELF']);
@@ -152,7 +153,9 @@
152153

153154
$global_error_message['encoding'] = 'UTF-8';
154155
$global_error_message['css'] = $css_def;
156+
155157

158+
// {ORGANISATION} moved from the header
156159
$global_error_message_page =
157160
<<<EOM
158161
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -168,15 +171,11 @@
168171
</head>
169172
<body>
170173
<div id="wrapper">
171-
172174
<div id="header">
173-
<div id="header1">
174-
<div id="institution">
175-
{ORGANISATION}
176-
</div>
175+
<div id="header1">
177176
</div>
178177
<div class="clear"></div>
179-
<div id="header2">&nbsp;</div>
178+
<div id="header2"></div>
180179
<div id="header3">
181180
<ul>
182181
<li id="current"><a href="#"><span id="tab_active">{SECTION}</span></a></li>
@@ -189,7 +188,7 @@
189188
190189
<div id="main">
191190
<div style="text-align: center;">
192-
<br /><br />{DESCRIPTION}<br /><br />
191+
<div class="warning-message">{DESCRIPTION}</div>
193192
{CODE}
194193
</div>
195194
</div>
@@ -198,17 +197,15 @@
198197
</div>
199198
200199
<div id="footer">
201-
<div class="copyright">{POWERED_BY}</div>
200+
<div class="copyright">&nbsp;<br />{POWERED_BY}</div>
202201
&nbsp;
203202
</div>
204203
</body>
205204
</html>
206205
EOM;
207-
208206
foreach ($global_error_message as $key => $value) {
209207
$global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
210208
}
211-
212209
header('Content-Type: text/html; charset='.$global_error_message['encoding']);
213210
die($global_error_message_page);
214-
}
211+
}

‎main/install/index.php‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,11 @@ function send_contact_information() {
431431

432432
<div id="header">
433433
<div id="header1">
434-
<div id="institution">
435-
<?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?>
436-
<?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) : ''); ?>
437-
</div>
438-
</div>
439-
<div id="header2" style="height:50px">&nbsp;</div>
434+
435+
<div id="logo">
436+
<img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
437+
</div>
438+
</div>
440439
<div id="header3">
441440
<ul>
442441
<li id="current"><a href="#"><span id="tab_active"><?php echo get_lang('Installation'); ?></span></a></li>
@@ -446,8 +445,7 @@ function send_contact_information() {
446445

447446
<div id="main">
448447
<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); ?>">
449-
<div id="installation_steps" style="width:220px">
450-
<!-- <img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo logo" /> -->
448+
<div id="installation_steps" style="width:220px">
451449
<br />
452450
<ol>
453451
<li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
@@ -470,6 +468,17 @@ function send_contact_information() {
470468
</tr>
471469
<tr>
472470
<td>
471+
<?php
472+
echo '<h1>';
473+
echo get_lang('ChamiloInstallation').' &ndash; '.get_lang('Version_').' '.$new_version;
474+
echo '</h1>';
475+
echo '<h2>';
476+
if ($installType == 'new')
477+
echo get_lang('NewInstallation');
478+
elseif ($installType == 'update')
479+
echo get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
480+
echo '</h2><hr />';
481+
?>
473482
<input type="hidden" name="updatePath" value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
474483
<input type="hidden" name="urlAppendPath" value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
475484
<input type="hidden" name="pathForm" value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />

‎main/install/install.lib.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function is_already_installed_system() {
5656
* @param string Text to show when extension is available (defaults to 'No')
5757
* @param boolean Whether this extension is optional (in this case show unavailable text in orange rather than red)
5858
* @return string HTML string reporting the status of this extension. Language-aware.
59-
* @author Christophe Gesché
59+
* @author Christophe Gesch??
6060
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
6161
* @author Yannick Warnier <yannick.warnier@dokeos.com>
6262
* @version Dokeos 1.8.1, May 2007
@@ -104,7 +104,7 @@ function get_php_setting($val) {
104104
*
105105
* @param integer $var The variable to present as text
106106
* @return string the string "true" or "false"
107-
* @author Christophe Gesché
107+
* @author Christophe Gesch??
108108
*/
109109
function true_false($var) {
110110
return $var ? 'true' : 'false';
@@ -992,7 +992,7 @@ function display_language_selection_box($name = 'language_list', $default_langua
992992
* can be done in the language of the user
993993
*/
994994
function display_language_selection() { ?>
995-
<h1><?php get_lang('WelcomeToTheDokeosInstaller'); ?></h1>
995+
<h2><?php get_lang('WelcomeToTheDokeosInstaller'); ?></h2>
996996
<h2><?php echo display_step_sequence(); ?><?php echo get_lang('InstallationLanguage'); ?></h2>
997997
<p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
998998
<form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -1026,7 +1026,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
10261026
}
10271027

10281028
// SERVER REQUIREMENTS
1029-
echo '<div class="RequirementHeading"><h1>'.get_lang('ServerRequirements').'</h1>';
1029+
echo '<div class="RequirementHeading"><h2>'.get_lang('ServerRequirements').'</h2>';
10301030
echo '<div class="RequirementText">'.get_lang('ServerRequirementsInfo').'</div>';
10311031
echo '<div class="RequirementContent">';
10321032
echo '<table class="requirements">
@@ -1096,7 +1096,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
10961096
// RECOMMENDED SETTINGS
10971097
// Note: these are the settings for Joomla, does this also apply for Chamilo?
10981098
// Note: also add upload_max_filesize here so that large uploads are possible
1099-
echo '<div class="RequirementHeading"><h1>'.get_lang('RecommendedSettings').'</h1>';
1099+
echo '<div class="RequirementHeading"><h2>'.get_lang('RecommendedSettings').'</h2>';
11001100
echo '<div class="RequirementText">'.get_lang('RecommendedSettingsInfo').'</div>';
11011101
echo '<div class="RequirementContent">';
11021102
echo '<table class="requirements">
@@ -1165,7 +1165,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
11651165
echo '</div>';
11661166

11671167
// DIRECTORY AND FILE PERMISSIONS
1168-
echo '<div class="RequirementHeading"><h1>'.get_lang('DirectoryAndFilePermissions').'</h1>';
1168+
echo '<div class="RequirementHeading"><h2>'.get_lang('DirectoryAndFilePermissions').'</h2>';
11691169
echo '<div class="RequirementText">'.get_lang('DirectoryAndFilePermissionsInfo').'</div>';
11701170
echo '<div class="RequirementContent">';
11711171
echo '<table class="requirements">
@@ -1483,19 +1483,19 @@ function get_contact_registration_form() {
14831483
<div class="label">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</div>
14841484
<div class="formw">
14851485
<select id="language" name="language">
1486-
<option value="bulgarian">Български</option>
1486+
<option value="bulgarian">??????????????????</option>
14871487
<option value="indonesian">Bahasa Indonesia</option>
14881488
<option value="bosnian">Bosanski</option>
14891489
<option value="german">Deutsch</option>
14901490
<option selected="selected" value="english">English</option>
14911491
<option value="spanish">Spanish</option>
1492-
<option value="french">Français</option>
1492+
<option value="french">Fran??ais</option>
14931493
<option value="italian">Italian</option>
14941494
<option value="hungarian">Magyar</option>
14951495
<option value="dutch">Nederlands</option>
1496-
<option value="brazilian">Português do Brasil</option>
1497-
<option value="portuguese">Português europeu</option>
1498-
<option value="slovenian">Slovenščina</option>
1496+
<option value="brazilian">Portugu??s do Brasil</option>
1497+
<option value="portuguese">Portugu??s europeu</option>
1498+
<option value="slovenian">Sloven????ina</option>
14991499
</select>
15001500
</div>
15011501
</div>

0 commit comments

Comments
 (0)