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

[svn r19996] minor Remove icons in all Messsage fields and allow HTML see FS#4079

Browse Source
skala
Carlos Vargas 16 years ago
parent 25459107bb
commit f62b891761
4 changed files with 15 additions and 11 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. 12
      main/inc/lib/display.lib.php
  2. 2
      main/install/index.php
  3. 10
      main/install/install_functions.inc.php
  4. 2
      main/install/update-files-1.8.3-1.8.4.inc.php

12
main/inc/lib/display.lib.php
Unescape View File

@ -382,7 +382,8 @@ class Display {
</style>';
}
echo '<div class="normal-message">';
Display :: display_icon('message_normal.gif', get_lang('InfoMessage'), array ('style' => 'float:left; margin-right:10px;'));
//Display :: display_icon('message_normal.gif', get_lang('InfoMessage'), array ('style' => 'float:left; margin-right:10px;'));
get_lang('InfoMessage', array ('style' => 'float:left; margin-right:10px;'));
echo "<div style='margin-left: 43px'>".$message.'</div></div>';
}
@ -412,7 +413,8 @@ class Display {
</style>';
}
echo '<div class="warning-message">';
Display :: display_icon('message_warning.png', get_lang('WarningMessage'), array ('style' => 'float:left; margin-right:10px;'));
//Display :: display_icon('message_warning.png', get_lang('WarningMessage'), array ('style' => 'float:left; margin-right:10px;'));
get_lang('WarningMessage', array ('style' => 'float:left; margin-right:10px;'));
echo $message.'</div>';
}
@ -441,7 +443,8 @@ class Display {
</style>';
}
echo '<div class="confirmation-message">';
Display :: display_icon('message_confirmation.gif', get_lang('ConfirmationMessage'), array ('style' => 'float:left; margin-right:10px;margin-left:5px;'));
//Display :: display_icon('message_confirmation.gif', get_lang('ConfirmationMessage'), array ('style' => 'float:left; margin-right:10px;margin-left:5px;'));
get_lang('ConfirmationMessage', array ('style' => 'float:left; margin-right:10px;margin-left:5px;'));
echo $message.'</div>';
}
@ -474,7 +477,8 @@ class Display {
</style>';
}
echo '<div class="error-message">';
Display :: display_icon('message_error.png', get_lang('ErrorMessage'), array ('style' => 'float:left; margin-right:10px;'));
//Display :: display_icon('message_error.png', get_lang('ErrorMessage'), array ('style' => 'float:left; margin-right:10px;'));
get_lang('ErrorMessage', array ('style' => 'float:left; margin-right:10px;'));
echo $message.'</div>';
}
/**

2
main/install/index.php
Unescape View File

@ -625,7 +625,7 @@ elseif($_POST['step5'])
<table width="100%">
<tr>
<td><button type="submit" class="back" name="step4" value="&lt; <?php echo get_lang('Previous'); ?>" /><?php echo get_lang('Previous'); ?></button></td>
<td align="right"><button class="save" type="submit" name="step6" value="<?php echo get_lang('InstallDokeos'); ?> &gt;" onclick="javascript:if(this.value == '<?php $msg = get_lang('PleaseWait');?>...') return false; else this.value='<?php $msg = get_lang('PleaseWait');?>...';" ><?php echo $msg; ?></button></td>
<td align="right"><button class="save" type="submit" name="step6" value="<?php echo get_lang('InstallDokeos'); ?> &gt;" onclick="javascript:if(this.value == '<?php $msg = get_lang('PleaseWait');?>...') return false; else this.value='<?php $msg = get_lang('InstallDokeos');?>...';" ><?php echo $msg; ?></button></td>
</tr>
</table>

10
main/install/install_functions.inc.php
Unescape View File

@ -913,9 +913,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
if($dbConnect==1): ?>
<td colspan="2">
<div class="confirmation-message">
<div style="float:left; margin-right:10px;">
<!--<div style="float:left; margin-right:10px;">
<img src="../img/message_confirmation.png" alt="Confirmation" />
</div>
</div>-->
<div style="float:left;">
MySQL host info: <?php echo mysql_get_host_info(); ?><br />
MySQL server version: <?php echo mysql_get_server_info(); ?><br />
@ -927,9 +927,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
<?php else: ?>
<td colspan="2">
<div style="float:left;" class="error-message">
<div style="float:left; margin-right:10px;">
<!--<div style="float:left; margin-right:10px;">
<img src="../img/message_error.png" alt="Error" />
</div>
</div>-->
<div style="float:left;">
<strong>MySQL error: <?php echo mysql_errno(); ?></strong><br />
<?php echo mysql_error().'<br/>'; ?>
@ -1144,7 +1144,7 @@ function display_after_install_message($installType, $nbr_courses)
<br /><br />
<?php
echo '<div class="warning-message">';
echo '<img src="../img/message_warning.png" style="float:left; margin-right:10px;" alt="'.get_lang('Warning').'"/>';
//echo '<img src="../img/message_warning.png" style="float:left; margin-right:10px;" alt="'.get_lang('Warning').'"/>';
echo '<b>'.get_lang('SecurityAdvice').'</b>';
echo ': ';
printf(get_lang('ToProtectYourSiteMakeXAndYReadOnly'),'main/inc/conf/configuration.php','main/install/index.php');

2
main/install/update-files-1.8.3-1.8.4.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: update-files-1.8.3-1.8.4.inc.php 13095 2007-09-19 17:43:08Z yannoo $
<?php //$Id: update-files-1.8.3-1.8.4.inc.php 19996 2009-04-22 22:11:14Z cvargas1 $
/*
==============================================================================
Dokeos - elearning and course management software

Write Preview
Loading…
Cancel
Save