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

Feature #3365 improve return navigation in learning path tool (first step)

Browse Source
skala
Juan Carlos Raña 15 years ago
parent ef28ce0eef
commit 40407dd498
5 changed files with 77 additions and 21 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. 15
      main/exercice/exercise_admin.php
  2. 35
      main/forum/forumfunction.inc.php
  3. 20
      main/forum/index.php
  4. 22
      main/link/link.php
  5. 6
      main/newscorm/learnpath.class.php

15
main/exercice/exercise_admin.php
Unescape View File

@ -187,7 +187,20 @@ if ($form->validate()) {
if ($objExercise->id != 0) { if ($objExercise->id != 0) {
echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'','32').'</a>'; echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'','32').'</a>';
} else { } else {
echo '<a href="exercice.php">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'','32').'</a>'; if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
if (!empty($_POST['lp_id'])){
$lp_id=Security::remove_XSS($_POST['lp_id']);//TODO:this remains to be implemented after press the first post
}
else{
$lp_id=Security::remove_XSS($_GET['lp_id']);
}
echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'','32')."</a>";
}
else{
echo '<a href="exercice.php">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'','32').'</a>';
}
} }
echo '</div>'; echo '</div>';

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

@ -48,16 +48,19 @@ $(document).ready(function () {
* @return void * @return void
* *
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version february 2006, dokeos 1.8 *
* Juan Carlos Raña Trabado (return to lp_id)
*
* @version may 2011, Chamilo 1.8.8
*/ */
function handle_forum_and_forumcategories() { function handle_forum_and_forumcategories($lp_id) {
$action_forum_cat = isset($_GET['action']) ? $_GET['action'] : ''; $action_forum_cat = isset($_GET['action']) ? $_GET['action'] : '';
$post_submit_cat = isset($_POST['SubmitForumCategory']) ? true : false; $post_submit_cat = isset($_POST['SubmitForumCategory']) ? true : false;
$post_submit_forum = isset($_POST['SubmitForum']) ? true : false; $post_submit_forum = isset($_POST['SubmitForum']) ? true : false;
$get_id = isset($_GET['id']) ? $_GET['id'] : ''; $get_id = isset($_GET['id']) ? $_GET['id'] : '';
// Adding a forum category. // Adding a forum category.
if (($action_forum_cat == 'add' && $_GET['content'] == 'forumcategory') || $post_submit_cat) { if (($action_forum_cat == 'add' && $_GET['content'] == 'forumcategory') || $post_submit_cat) {
show_add_forumcategory_form(); show_add_forumcategory_form($inputvalues, $lp_id);//$lp_id when is called from learning path
} }
// Adding a forum. // Adding a forum.
if ((($action_forum_cat == 'add' || $action_forum_cat == 'edit') && $_GET['content'] == 'forum') || $post_submit_forum) { if ((($action_forum_cat == 'add' || $action_forum_cat == 'edit') && $_GET['content'] == 'forum') || $post_submit_forum) {
@ -66,7 +69,7 @@ function handle_forum_and_forumcategories() {
} else { } else {
$inputvalues = array(); $inputvalues = array();
} }
show_add_forum_form($inputvalues); show_add_forum_form($inputvalues,$lp_id);
} }
// Edit a forum category. // Edit a forum category.
if (($action_forum_cat == 'edit' && $_GET['content'] == 'forumcategory' && isset($_GET['id'])) || (isset($_POST['SubmitEditForumCategory'])) ? true : false ) { if (($action_forum_cat == 'edit' && $_GET['content'] == 'forumcategory' && isset($_GET['id'])) || (isset($_POST['SubmitEditForumCategory'])) ? true : false ) {
@ -116,14 +119,18 @@ function handle_forum_and_forumcategories() {
* @return void HTML * @return void HTML
* *
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version february 2006, dokeos 1.8 *
* Juan Carlos Raña Trabado (return to lp_id)
*
* @version may 2011, Chamilo 1.8.8
*/ */
function show_add_forumcategory_form($inputvalues = array()) { function show_add_forumcategory_form($inputvalues = array(),$lp_id) {
$gradebook = Security::remove_XSS($_GET['gradebook']); $gradebook = Security::remove_XSS($_GET['gradebook']);
// Initialize the object. // Initialize the object.
$form = new FormValidator('forumcategory', 'post', 'index.php?&amp;gradebook='.$gradebook.''); $form = new FormValidator('forumcategory', 'post', 'index.php?&amp;gradebook='.$gradebook.'');
// hidden field if from learning path
$form->addElement('hidden', 'lp_id', $lp_id);
// Settting the form elements. // Settting the form elements.
$form->addElement('header', '', get_lang('AddForumCategory')); $form->addElement('header', '', get_lang('AddForumCategory'));
$form->addElement('text', 'forum_category_title', get_lang('Title'), 'class="input_titles" id="category_title"'); $form->addElement('text', 'forum_category_title', get_lang('Title'), 'class="input_titles" id="category_title"');
@ -160,9 +167,12 @@ function show_add_forumcategory_form($inputvalues = array()) {
* @return void HTML * @return void HTML
* *
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version february 2006, dokeos 1.8 *
* Juan Carlos Raña Trabado (return to lp_id)
*
* @version may 2011, Chamilo 1.8.8
*/ */
function show_add_forum_form($inputvalues = array()) { function show_add_forum_form($inputvalues = array(),$lp_id) {
global $_course; global $_course;
$gradebook = Security::remove_XSS($_GET['gradebook']); $gradebook = Security::remove_XSS($_GET['gradebook']);
@ -171,7 +181,7 @@ function show_add_forum_form($inputvalues = array()) {
// The header for the form // The header for the form
if (!empty($inputvalues)) { if (!empty($inputvalues)) {
$form_title = get_lang('EditForum'); $form_title = get_lang('EditForum');
} else { } else {
$form_title = get_lang('AddForum'); $form_title = get_lang('AddForum');
} }
@ -183,7 +193,10 @@ function show_add_forum_form($inputvalues = array()) {
$my_forum_id = isset($inputvalues['forum_id']) ? $inputvalues['forum_id'] : null; $my_forum_id = isset($inputvalues['forum_id']) ? $inputvalues['forum_id'] : null;
$form->addElement('hidden', 'forum_id', $my_forum_id); $form->addElement('hidden', 'forum_id', $my_forum_id);
} }
// The title of the forum // hidden field if from learning path
$form->addElement('hidden', 'lp_id', $lp_id);
// The title of the forum
$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles" id="forum_title"'); $form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles" id="forum_title"');
//$form->applyFilter('forum_title', 'html_filter'); //$form->applyFilter('forum_title', 'html_filter');

20
main/forum/index.php
Unescape View File

@ -108,7 +108,16 @@ $form_count = 0;
$get_actions = isset($_GET['action']) ? $_GET['action'] : ''; $get_actions = isset($_GET['action']) ? $_GET['action'] : '';
if (api_is_allowed_to_edit(false, true)) { if (api_is_allowed_to_edit(false, true)) {
handle_forum_and_forumcategories();
//if is called from a learning path lp_id
if (!empty($_POST['lp_id'])){
$lp_id=Security::remove_XSS($_POST['lp_id']);
}
else{
$lp_id=Security::remove_XSS($_GET['lp_id']);
}
handle_forum_and_forumcategories($lp_id);
} }
// Notification // Notification
@ -168,11 +177,16 @@ if (isset($_SESSION['_gid'])) {
$session_id = isset($_SESSION['id_session']) ? $_SESSION['id_session'] : false; $session_id = isset($_SESSION['id_session']) ? $_SESSION['id_session'] : false;
//if (api_is_allowed_to_edit() and !$_GET['action']) //if (api_is_allowed_to_edit() and !$_GET['action'])
echo '<div class="actions">'; echo '<div class="actions">';
//if is called from learning path
if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-5\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'','32')."</a>";
}
echo '<span>'.search_link().'</span>'; echo '<span>'.search_link().'</span>';
if (api_is_allowed_to_edit(false, true)) { if (api_is_allowed_to_edit(false, true)) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forumcategory"> '.Display::return_icon('new_folder.png', get_lang('AddForumCategory'),'','32').'</a>'; echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forumcategory&amp;lp_id='.$lp_id.'"> '.Display::return_icon('new_folder.png', get_lang('AddForumCategory'),'','32').'</a>';
if (is_array($forum_categories_list) and !empty($forum_categories_list)) { if (is_array($forum_categories_list) and !empty($forum_categories_list)) {
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forum"> '.Display::return_icon('new_forum.png', get_lang('AddForum'),'','32').'</a>'; echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forum&amp;lp_id='.$lp_id.'"> '.Display::return_icon('new_forum.png', get_lang('AddForum'),'','32').'</a>';
} }
//echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>'; //echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>';
} }

22
main/link/link.php
Unescape View File

@ -159,7 +159,21 @@ Display::display_introduction_section(TOOL_LINK);
if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) { if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview'),'','32').'</a>'; if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
if (!empty($_POST['lp_id'])){
$lp_id=Security::remove_XSS($_POST['lp_id']);
}
else{
$lp_id=Security::remove_XSS($_GET['lp_id']);
}
echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-3\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'','32')."</a>";
}
else{
echo '<a href="link.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;urlview='.Security::remove_XSS($_GET['urlview']).'">'.Display::return_icon('back.png', get_lang('BackToLinksOverview'),'','32').'</a>';
}
echo '</div>'; echo '</div>';
// Displaying the correct title and the form for adding a category or link. This is only shown when nothing // Displaying the correct title and the form for adding a category or link. This is only shown when nothing
@ -300,8 +314,10 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo sprintf($sf_textbox, $specific_field['name'], $specific_field['code'], $default_values); echo sprintf($sf_textbox, $specific_field['name'], $specific_field['code'], $default_values);
} }
} }
echo ' <div class="row"> //echo '<input type="hidden" name="origin" value="' . Security::remove_XSS($_GET['origin']) . '" />';
echo '<input type="hidden" name="lp_id" value="' . Security::remove_XSS($_GET['lp_id']) . '" />';
echo '<div class="row">
<div class="label"> <div class="label">
</div> </div>
<div class="formw"> <div class="formw">

6
main/newscorm/learnpath.class.php
Unescape View File

@ -7525,7 +7525,7 @@ class learnpath {
$return .= '<div class="lp_resource_element">'; $return .= '<div class="lp_resource_element">';
$return .= '<img alt="" src="../img/new_test_small.gif" style="margin-right:5px;" title="" />'; $return .= '<img alt="" src="../img/new_test_small.gif" style="margin-right:5px;" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'exercice/exercise_admin.php&amp;origin=learnpath">' . get_lang('NewExercise') . '</a>'; $return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'exercice/exercise_admin.php?lp_id=' . $this->lp_id . '">' . get_lang('NewExercise') . '</a>';
$return .= '</div>'; $return .= '</div>';
@ -7572,7 +7572,7 @@ class learnpath {
$return .= '<div class="lp_resource_element">'; $return .= '<div class="lp_resource_element">';
$return .= '<img alt="" src="../img/linksnew.gif" style="margin-right:5px;width:16px" title="" />'; $return .= '<img alt="" src="../img/linksnew.gif" style="margin-right:5px;width:16px" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'link/link.php?' . api_get_cidreq() . '&action=addlink&amp;origin=learnpath" title="' . get_lang('LinkAdd') . '">' . get_lang('LinkAdd') . '</a>'; $return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'link/link.php?' . api_get_cidreq() . '&action=addlink&amp;lp_id=' . $this->lp_id . '" title="' . get_lang('LinkAdd') . '">' . get_lang('LinkAdd') . '</a>';
$return .= '</div>'; $return .= '</div>';
while ($row_link = Database :: fetch_array($res_link)) { while ($row_link = Database :: fetch_array($res_link)) {
@ -7632,7 +7632,7 @@ class learnpath {
$return .= '<div class="lp_resource_element">'; $return .= '<div class="lp_resource_element">';
$return .= '<img alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />'; $return .= '<img alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />';
$return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&action=add&amp;content=forum&amp;origin=learnpath" title="' . get_lang('CreateANewForum') . '">' . get_lang('CreateANewForum') . '</a>'; $return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&action=add&amp;content=forum&amp;origin=learnpath&amp;lp_id=' . $this->lp_id . '" title="' . get_lang('CreateANewForum') . '">' . get_lang('CreateANewForum') . '</a>';
$return .= '</div>'; $return .= '</div>';
foreach ($a_forums as $forum) { foreach ($a_forums as $forum) {

Write Preview
Loading…
Cancel
Save