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 r15774] Add semi-column to   when missing - patch suggested by Philippe De Ryck - see FS#2698

Browse Source
skala
Yannick Warnier 18 years ago
parent 8f2cce1c29
commit 09957a0414
5 changed files with 18 additions and 18 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. 4
      main/course_home/activity.php
  2. 4
      main/inc/lib/fileManage.lib.php
  3. 6
      main/install/upgrade.php
  4. 12
      main/survey/survey.lib.php
  5. 10
      main/work/work.lib.php

4
main/course_home/activity.php
Unescape View File

@ -291,10 +291,10 @@ function show_tools_category($course_tool_category)
$toolsRow['link'] = $toolsRow['link'].$qm_or_amp.api_get_cidreq();
}
if(strpos($toolsRow['name'],'visio_')!==false){
echo "\t" . ' &nbsp <a ' . $class . ' href="#" onclick="window.open(\'' . htmlspecialchars($toolsRow['link']) . '\',\'window_visio\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="' . $toolsRow['target'] . '">&nbsp;&nbsp;';
echo "\t" . ' &nbsp; <a ' . $class . ' href="#" onclick="window.open(\'' . htmlspecialchars($toolsRow['link']) . '\',\'window_visio\',config=\'height=\'+730+\', width=\'+1020+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="' . $toolsRow['target'] . '">&nbsp;&nbsp;';
}
else {
echo "\t" . ' &nbsp <a ' . $class . ' href="' . htmlspecialchars($toolsRow['link']) . '" target="' . $toolsRow['target'] . '">&nbsp;&nbsp;';
echo "\t" . ' &nbsp; <a ' . $class . ' href="' . htmlspecialchars($toolsRow['link']) . '" target="' . $toolsRow['target'] . '">&nbsp;&nbsp;';
}
echo '<img src="' . $web_code_path . 'img/' . $toolsRow['image'] . '" align="absmiddle" border="0" alt="' . $toolsRow['image'] . '" /> &nbsp;&nbsp;';

4
main/inc/lib/fileManage.lib.php
Unescape View File

@ -1,4 +1,4 @@
<?php # $Id: fileManage.lib.php 15744 2008-07-07 23:43:28Z yannoo $
<?php # $Id: fileManage.lib.php 15774 2008-07-14 02:46:42Z yannoo $
/* vim: set expandtab tabstop=4 shiftwidth=4:
===============================================================================
@ -501,7 +501,7 @@ function form_dir_list($sourceType, $sourceComponent, $command, $baseWorkDir)
for ($h=0; $h<$depth; $h++)
{
$tab .= "&nbsp;&nbsp";
$tab .= "&nbsp;&nbsp;";
}
$dialogBox .= "<option value=\"$pathValue\">$tab>$dirname\n";
}

6
main/install/upgrade.php
Unescape View File

@ -125,7 +125,7 @@ class Page_Language extends HTML_QuickForm_Page
$this->_formBuilt = true;
$this->addElement('select', 'install_language', get_lang('InstallationLanguage'), get_language_folder_list());
$buttons[0] = & HTML_QuickForm :: createElement('submit', $this->getButtonName('next'), get_lang('Next').' >>');
$this->addGroup($buttons, 'buttons', '', '&nbsp', false);
$this->addGroup($buttons, 'buttons', '', '&nbsp;', false);
$this->setDefaultAction('next');
}
}
@ -222,7 +222,7 @@ class Page_Requirements extends HTML_QuickForm_Page
$this->_formBuilt = true;
$this->addElement('radio', 'installation_type', get_lang('InstallType'), get_lang('NewInstall'), 'new');
$update_group[0] = & HTML_QuickForm :: createElement('radio', 'installation_type', null, 'Update from Dokeos '.implode('|', $updateFromVersion).'', 'update');
//$this->addGroup($update_group, 'update_group', '', '&nbsp', false);
//$this->addGroup($update_group, 'update_group', '', '&nbsp;', false);
$prevnext[] = & $this->createElement('submit', $this->getButtonName('back'), '<< '.get_lang('Previous'));
$prevnext[] = & $this->createElement('submit', $this->getButtonName('next'), get_lang('Next').' >>');
$not_writable = $this->get_not_writable_folders();
@ -938,4 +938,4 @@ include_once ("../lang/$install_language/install.inc.php");
//$values = $wizard->exportValues();
?>
?>

12
main/survey/survey.lib.php
Unescape View File

@ -23,7 +23,7 @@
/**
* @package dokeos.survey
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
* @version $Id: survey.lib.php 15640 2008-06-27 14:17:54Z elixir_inter $
* @version $Id: survey.lib.php 15774 2008-07-14 02:46:42Z yannoo $
*
* @todo move this file to inc/lib
* @todo use consistent naming for the functions (save vs store for instance)
@ -1065,7 +1065,7 @@ class question
*/
$this->html .=' <tr>
<td colspan="">&nbsp</td>
<td colspan="">&nbsp;</td>
</tr>';
return $this->html;
}
@ -1269,7 +1269,7 @@ class yesno extends question
$this->html .= ' <td>&nbsp;</td>';
$this->html .= ' </tr>';
$this->html .=' <tr>
<td colspan="">&nbsp</td>
<td colspan="">&nbsp;</td>
</tr>';
// The options
@ -1361,7 +1361,7 @@ class multiplechoice extends question
$this->html .= ' <td>&nbsp;</td>';
$this->html .= ' </tr>';
$this->html .=' <tr>
<td colspan="">&nbsp</td>
<td colspan="">&nbsp;</td>
</tr>';
// The Options
@ -1455,7 +1455,7 @@ class multipleresponse extends question
$this->html .= ' <td>&nbsp;</td>';
$this->html .= ' </tr>';
$this->html .=' <tr>
<td colspan="">&nbsp</td>
<td colspan="">&nbsp;</td>
</tr>';
@ -4018,4 +4018,4 @@ class SurveyUtil {
echo '</table>';
}
}
?>
?>

10
main/work/work.lib.php
Unescape View File

@ -45,22 +45,22 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_
if(strlen($cur_dir_path) > 0 && $cur_dir_path != '/')
{
$parent_dir = dirname($cur_dir_path);
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'&curdirpath='.$parent_dir.'">'.Display::return_icon('folder_up.gif').' '.get_lang('Up').'</a>&nbsp&nbsp';
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'&curdirpath='.$parent_dir.'">'.Display::return_icon('folder_up.gif').' '.get_lang('Up').'</a>&nbsp;&nbsp;';
}
if (! $always_show_upload_form )
{
$display_output .= "&nbsp&nbsp<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;display_upload_form=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('submit_file.gif')." ". get_lang("UploadADocument") .'</a>&nbsp&nbsp&nbsp&nbsp';
$display_output .= "&nbsp;&nbsp;<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;display_upload_form=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('submit_file.gif')." ". get_lang("UploadADocument") .'</a>&nbsp;&nbsp;&nbsp;&nbsp;';
}
if (! $always_show_tool_options && api_is_allowed_to_edit() )
{
// Create dir
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$cur_dir_path.'&amp;createdir=1&origin='.Security::remove_XSS($_GET['origin']).'"><img src="../img/folder_new.gif" border="0"alt ="'.get_lang('CreateDir').'" /> '.get_lang('CreateDir').' </a>&nbsp&nbsp';
$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;curdirpath='.$cur_dir_path.'&amp;createdir=1&origin='.Security::remove_XSS($_GET['origin']).'"><img src="../img/folder_new.gif" border="0"alt ="'.get_lang('CreateDir').'" /> '.get_lang('CreateDir').' </a>&nbsp;&nbsp;';
// Options
$display_output .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;origin=".Security::remove_XSS($_GET['origin'])."&amp;display_tool_options=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('acces_tool.gif').' ' . get_lang("EditToolOptions") . "</a>&nbsp&nbsp";
$display_output .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&curdirpath=".$cur_dir_path."&amp;origin=".Security::remove_XSS($_GET['origin'])."&amp;display_tool_options=true&amp;origin=".Security::remove_XSS($_GET['origin'])."\">".Display::return_icon('acces_tool.gif').' ' . get_lang("EditToolOptions") . "</a>&nbsp;&nbsp;";
}
if ($display_output != "")
@ -1003,4 +1003,4 @@ function count_dir($path_dir, $recurse)
$return_array[]=$count_dir;
return $return_array;
}
?>
?>

Write Preview
Loading…
Cancel
Save