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

merge

Browse Source
skala
aportugal 16 years ago
parent 5f88b6f914 09eadcc8ba
commit 6378582796
16 changed files with 65 additions and 68 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. 8
      main/announcements/announcements.php
  2. 6
      main/calendar/agenda.inc.php
  3. 12
      main/document/create_document.php
  4. 8
      main/document/upload.php
  5. 8
      main/dropbox/dropbox_functions.inc.php
  6. 8
      main/exercice/exercise.class.php
  7. 13
      main/forum/forumfunction.inc.php
  8. 4
      main/glossary/index.php
  9. 8
      main/gradebook/lib/fe/evalform.class.php
  10. 6
      main/newscorm/lp_add.php
  11. 6
      main/notebook/index.php
  12. 6
      main/survey/create_new_survey.php
  13. 6
      main/survey/survey.lib.php
  14. 8
      main/wiki/index.php
  15. 18
      main/wiki/wiki.inc.php
  16. 6
      main/work/work.php

8
main/announcements/announcements.php
Unescape View File

@ -25,7 +25,7 @@ $language_file[] = 'survey';
$use_anonymous = true;
// setting the global file that gets the general configuration, the databases, the languages, ...
include('../inc/global.inc.php');
require_once '../inc/global.inc.php';
$this_section=SECTION_COURSES;
$nameTools = get_lang('Announcement');
@ -211,9 +211,9 @@ $htmlHeadXtra[] = to_javascript();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#emailTitle").focus();
$("#announcement_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -1125,7 +1125,7 @@ if ($display_form == true) {
</div>
<div class="formw">
<input type="text" id="emailTitle" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
<input type="text" id="announcement_title" name="emailTitle" value="'.Security::remove_XSS($title_to_modify).'" size="60">
</div>
</div>';

6
main/calendar/agenda.inc.php
Unescape View File

@ -39,9 +39,9 @@ $htmlHeadXtra[] = to_javascript();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#agenda_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -2859,7 +2859,7 @@ function show_add_form($id = '')
</div>
<div class="formw">
<div id="err_title" style="display:none;color:red"></div>
<input type="text" id="title" size="60" name="title" value="';
<input type="text" id="agenda_title" size="60" name="title" value="';
if (isset($title)) echo $title;
echo '" />
</div>

12
main/document/create_document.php
Unescape View File

@ -42,12 +42,12 @@
// name of the language file that needs to be included
$language_file = 'document';
include ('../inc/global.inc.php');
require_once '../inc/global.inc.php';
$_SESSION['whereami'] = 'document/create';
$this_section = SECTION_COURSES;
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[]='<script>
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function InnerDialogLoaded()
{
/*
@ -185,7 +185,7 @@ function InnerDialogLoaded()
}
function setFocus(){
$("#title").focus();
$("#document_title").focus();
}
$(window).load(function () {
setFocus();
@ -361,7 +361,7 @@ $group = array();
if (api_get_setting('use_document_title') == 'true') {
//$group[]= $form->add_textfield('title', get_lang('Title'),true,'class="input_titles" id="title"');
// replace the add_textfield with this
$group[]=$form->createElement('text','title',get_lang('Title'),'class="input_titles" id="title"');
$group[]=$form->createElement('text','title',get_lang('Title'),'class="input_titles" id="document_title"');
//$form->applyFilter('title','trim');
//$form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
@ -371,7 +371,7 @@ if (api_get_setting('use_document_title') == 'true') {
} else {
//$form->add_textfield('filename', get_lang('FileName'),true,'class="input_titles" id="filename" onblur="check_if_still_empty()"');
// replace the add_textfield with this
$group[]=$form->createElement('text','filename',get_lang('FileName'),'class="input_titles" id="filename" onblur="check_if_still_empty()"');
$group[]=$form->createElement('text','filename',get_lang('FileName'),'class="input_titles" id="document_title" onblur="check_if_still_empty()"');
//$form->applyFilter('filename','trim');
//$form->addRule('filename', get_lang('ThisFieldIsRequired'), 'required');
//$form->addRule('filename', get_lang('FileExists'), 'callback', 'document_exists');

8
main/document/upload.php
Unescape View File

@ -59,7 +59,7 @@
$language_file = 'document';
// including the global Dokeos file
require_once "../inc/global.inc.php";
require_once '../inc/global.inc.php';
// including additional libraries
require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
@ -95,9 +95,9 @@ function advanced_parameters() {
}
function setFocus(){
$("#title").focus();
$("#title_file").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -555,7 +555,7 @@ $form->addElement('file','user_upload',get_lang('File'),'id="user_upload" size="
if(api_get_setting('use_document_title')=='true')
{
$form->addElement('text','title',get_lang('Title'),array('size'=>'20','style' => 'width:300px','id' => 'title'));
$form->addElement('text','title',get_lang('Title'),array('size'=>'20','style' => 'width:300px','id' => 'title_file'));
$form->addElement('textarea','comment',get_lang('Comment'),'wrap="virtual" style="width:300px;"');
}
//Advanced parameters

8
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -5,7 +5,7 @@
* functions in the init files also but I have moved them over
* to one file -- Patrick Cool <patrick.cool@UGent.be>, Ghent University
*/
include('../inc/global.inc.php');
require_once '../inc/global.inc.php';
/*
-----------------------------------------------------------
Javascript
@ -15,9 +15,9 @@ include('../inc/global.inc.php');
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#category_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -502,7 +502,7 @@ function display_addcategory_form($category_name='', $id='',$action)
{
echo '<span class="form_error">'.get_lang('CategoryAlreadyExistsEditIt').'<span><br />';
}
echo ' <input type="text" id="title" name="category_name" value="'.Security::remove_XSS($category_name).'" />
echo ' <input type="text" id="category_title" name="category_name" value="'.Security::remove_XSS($category_name).'" />
</div>
</div>';

8
main/exercice/exercise.class.php
Unescape View File

@ -7,7 +7,7 @@
* @author Olivier Brouckaert
* @version $Id: exercise.class.php 22046 2009-07-14 01:45:19Z ivantcholakov $
*/
include ('../inc/global.inc.php');
require_once '../inc/global.inc.php';
define('ALL_ON_ONE_PAGE',1);
define('ONE_PER_PAGE',2);
@ -18,9 +18,9 @@ define('EXERCISE_FEEDBACK_TYPE_EXAM',2);
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#exercise_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -917,7 +917,7 @@ class Exercise
}
$form->addElement('header', '', $form_title);
// title
$form -> addElement('text', 'exerciseTitle', get_lang('ExerciseName'),'class="input_titles" id="title"');
$form -> addElement('text', 'exerciseTitle', get_lang('ExerciseName'),'class="input_titles" id="exercise_title"');
//$form->applyFilter('exerciseTitle','html_filter');
$form -> addElement('html','<div class="row">

13
main/forum/forumfunction.inc.php
Unescape View File

@ -66,7 +66,6 @@
* -- Patrick Cool <patrick.cool@UGent.be>
**************************************************************************
*/
require_once '../inc/global.inc.php';
require_once(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
require_once(api_get_path(INCLUDE_PATH).'/conf/mail.conf.php');
@ -82,9 +81,11 @@ get_notifications_of_user();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#forum_title").focus();
$("#category_title").focus();
$("#search_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -171,7 +172,7 @@ function show_add_forumcategory_form($inputvalues=array()) {
// settting the form elements
$form->addElement('header', '', get_lang('AddForumCategory'));
$form->addElement('text', 'forum_category_title', get_lang('Title'),'class="input_titles" id="title"');
$form->addElement('text', 'forum_category_title', get_lang('Title'),'class="input_titles" id="category_title"');
//$form->applyFilter('forum_category_title', 'html_filter');
$form->addElement('html_editor', 'forum_category_comment', get_lang('Comment'), null, array('ToolbarSet' => 'Forum', 'Width' => '98%', 'Height' => '200'));
//$form->applyFilter('forum_category_comment', 'html_filter');
@ -225,7 +226,7 @@ function show_add_forum_form($inputvalues=array()) {
$form->addElement('hidden', 'forum_id', $my_forum_id);
}
// The title of the forum
$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles" id="title"');
$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles" id="forum_title"');
//$form->applyFilter('forum_title', 'html_filter');
// The comment of the forum
$form->addElement('html_editor', 'forum_comment', get_lang('Comment'), null, array('ToolbarSet' => 'Forum', 'Width' => '98%', 'Height' => '200'));
@ -3223,7 +3224,7 @@ function forum_search() {
// settting the form elements
$form->addElement('header', '', get_lang('ForumSearch'));
$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="title"');
$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="search_title"');
$form->applyFilter('search_term', 'html_filter');
$form->addElement('static', 'search_information', '', get_lang('ForumSearchInformation')/*, $dissertation[$_GET['opleidingsonderdeelcode']]['code']*/);
$form->addElement('style_submit_button', null, get_lang('Search'), 'class="search"');

4
main/glossary/index.php
Unescape View File

@ -10,7 +10,7 @@
$language_file = array('glossary');
// including the global dokeos file
require_once('../inc/global.inc.php');
require_once '../inc/global.inc.php';
// the section (tabs)
$this_section=SECTION_COURSES;
@ -28,7 +28,7 @@ $htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#glossary_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';

8
main/gradebook/lib/fe/evalform.class.php
Unescape View File

@ -33,12 +33,12 @@ require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.ph
* @package dokeos.gradebook
*/
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#evaluation_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -326,7 +326,7 @@ class EvalForm extends FormValidator
$this->add_textfield('name', get_lang('EvaluationName'), true, array (
'size' => '54',
'maxlength' => '50',
'id' => 'title'
'id' => 'evaluation_title'
));
$this->add_textfield('weight', get_lang('Weight'), true, array (
'size' => '4',

6
main/newscorm/lp_add.php
Unescape View File

@ -68,9 +68,9 @@ $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="dtree.css" />';
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#idTitle").focus();
$("#learnpath_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -154,7 +154,7 @@ echo '<div class="label">';
echo '<label for="idTitle"><span class="form_required">*</span> '.get_lang('LPName').'</label>';
echo '</div>';
echo '<div class="formw">';
echo '<input id="idTitle" name="learnpath_name" type="text" size="50" />';
echo '<input id="learnpath_title" name="learnpath_name" type="text" size="50" />';
echo '</div>';
echo '</div>';

6
main/notebook/index.php
Unescape View File

@ -29,9 +29,9 @@ $htmlHeadXtra[] = javascript_notebook();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#notetitle").focus();
$("#note_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -80,7 +80,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'addnote')
$form = new FormValidator('note','post', api_get_self().'?action='.Security::remove_XSS($_GET['action']));
// settting the form elements
$form->addElement('header', '', get_lang('NoteAddNew'));
$form->addElement('text', 'note_title', get_lang('NoteTitle'),array('size'=>'95', 'id'=> 'notetitle'));
$form->addElement('text', 'note_title', get_lang('NoteTitle'),array('size'=>'95', 'id'=> 'note_title'));
//$form->applyFilter('note_title', 'html_filter');
$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'), null, api_is_allowed_to_edit()
? array('ToolbarSet' => 'Notebook', 'Width' => '100%', 'Height' => '300')

6
main/survey/create_new_survey.php
Unescape View File

@ -64,9 +64,9 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
}
function setFocus(){
$("#SurveyCode").focus();
$("#surveycode_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -155,7 +155,7 @@ if ($_GET['action'] == 'edit' AND isset($survey_id) AND is_numeric($survey_id))
$form->addElement('hidden', 'survey_id');
}
$survey_code = $form->addElement('text', 'survey_code', get_lang('SurveyCode'), array('size' => '20','maxlength'=>'20', 'id'=>'SurveyCode'));
$survey_code = $form->addElement('text', 'survey_code', get_lang('SurveyCode'), array('size' => '20','maxlength'=>'20', 'id'=>'surveycode_title'));
//$form->applyFilter('survey_code', 'html_filter');
if ($_GET['action'] == 'edit') {

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

@ -36,9 +36,9 @@ require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
function setFocus(){
$("#keyword_title").focus();
$("#search_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -4396,7 +4396,7 @@ class SurveyUtil {
'.get_lang('Title').'
</div>
<div class="formw">
<input type="text" id="keyword_title" name="keyword_title"/>
<input type="text" id="search_title" name="keyword_title"/>
</div>
</div>';
echo ' <div class="row">

8
main/wiki/index.php
Unescape View File

@ -43,7 +43,7 @@ if(isset($_GET['id_session'])) {
}
// including the global dokeos file
include('../inc/global.inc.php');
require_once '../inc/global.inc.php';
// section (for the tabs)
$this_section=SECTION_COURSES;
@ -76,9 +76,9 @@ function advanced_parameters() {
}
}
function setFocus(){
$("#search_term").focus();
$("#search_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
@ -1040,7 +1040,7 @@ if ($_GET['action']=='searchpages')
// settting the form elements
$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="search_term"');
$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="search_title"');
$form->addElement('checkbox', 'search_content', null, get_lang('AlsoSearchContent'));
$form->addElement('style_submit_button', 'SubmitWikiSearch', get_lang('Search'), 'class="search"');

18
main/wiki/wiki.inc.php
Unescape View File

@ -32,16 +32,6 @@
* @package dokeos.wiki
*/
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
function setFocus(){
$("#title").focus();
}
$(window).load(function () {
setFocus();
});
</script>';
/*
==============================================================================
FUNCTIONS FOR WIKI
@ -603,12 +593,18 @@ function CheckSend()
}
return true;
}
function setFocus(){
$("#wiki_title").focus();
}
$(document).ready(function () {
setFocus();
});
</script>
<?php
//form
echo '<form name="form1" method="post" onsubmit="return CheckSend()" action="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
echo '<div id="wikititle">';
echo '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" id="title" name="title" value="'.urldecode($_GET['title']).'" size="40">';
echo '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" id="wiki_title" name="title" value="'.urldecode($_GET['title']).'" size="40">';
if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
{

6
main/work/work.php
Unescape View File

@ -100,9 +100,9 @@ $htmlHeadXtra[] = to_javascript_work();
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#title").focus();
$("#work_title").focus();
}
$(window).load(function () {
$(document).ready(function () {
setFocus();
});
</script>';
@ -1404,7 +1404,7 @@ function draw_date_picker($prefix,$default='') {
</div>
<div class="formw">
<div id="msg_error1" style="display:none;color:red"></div>
<input type="text" id="title" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>
<input type="text" id="work_title" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>
</div>
</div>';
//$new_folder_text .= '<button type="button" name="create_dir" class="add" onClick="validate();" value="' . get_lang('Ok') . '"/>'.get_lang('CreateDirectory').'</button>';

Write Preview
Loading…
Cancel
Save